refactor: upgrade everything to latest now that hubcaps is gone

This commit is contained in:
Ilya K 2024-11-16 19:14:09 +03:00
parent 801fddc210
commit d3e5505812
4 changed files with 617 additions and 225 deletions

774
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -7,4 +7,4 @@ edition = "2018"
[dependencies]
ofborg = { path = "../ofborg" }
log = "0.4.17"
log = "0.4.22"

View file

@ -9,37 +9,38 @@ build = "build.rs"
edition = "2018"
[dependencies]
async-stream = "0.3.6"
axum = "0.7.8"
base64 = "0.22.1"
brace-expand = "0.1.0"
chrono = "0.4.22"
either = "1.8.0"
chrono = "0.4.38"
clap = { version = "4.5.21", features = ["derive"] }
either = "1.13.0"
fs2 = "0.4.3"
futures-util = "0.3.25"
hyper = "=0.10.*"
http = "0.2"
futures = "0.3.31"
futures-util = "0.3.31"
http = "1.1"
hyper = "1.5"
hyper-server = "0.6.0"
jfs = "0.9.0"
lapin = "2.5.0"
lru-cache = "0.1.2"
md5 = "0.7.0"
nom = "4.2.3"
regex = "1.7.0"
nom = "4,<5"
openssh = { version = "0.11.3", features = ["process-mux"], default-features = false }
regex = "1.11.1"
rustls-pemfile = "2.2.0"
separator = "0.4.1"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
sys-info = "0.9.1"
tempfile = "3.3.0"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["json", "env-filter"] }
uuid = { version = "1.2", features = ["v4"] }
rustls-pemfile = "1.0.2"
shellexpand = "3.1.0"
clap = { version = "4.5.20", features = ["derive"] }
zstd = "0.13.2"
jfs = "0.9.0"
base64 = "0.22.1"
thiserror = "1.0.67"
openssh = { version = "0.11.3", features = ["process-mux"], default-features = false }
futures = "0.3.31"
tokio = "1.41.1"
sys-info = "0.9.1"
tempfile = "3.14.0"
thiserror = "2.0.3"
tokio = { version = "1.41.1", features = ["rt-multi-thread"] }
tokio-stream = { version = "0.1.16", features = ["io-util"] }
async-stream = "0.3.6"
# reqwest = "0.12.9"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
uuid = { version = "1.11", features = ["v4"] }
zstd = "0.13.2"

View file

@ -2,8 +2,10 @@ use std::env;
use std::error::Error;
use std::thread;
use axum::routing::get;
use futures::executor::block_on;
use hyper::server::{Request, Response, Server};
use axum::Router;
use tokio::runtime::Runtime;
use tracing::info;
use ofborg::easyamqp::{ChannelExt, ConsumerExt};
@ -63,12 +65,15 @@ fn main() -> Result<(), Box<dyn Error>> {
)?;
thread::spawn(|| {
let addr = "0.0.0.0:9898";
info!("listening addr {:?}", addr);
Server::http(addr)?.handle(move |_: Request, res: Response| {
res.send(metrics.prometheus_output().as_bytes()).unwrap();
})?;
Ok::<_, Box<dyn Error + Sync + Send + '_>>(())
Runtime::new().unwrap().block_on(async {
let addr = "0.0.0.0:9898";
info!("listening addr {:?}", addr);
let app = Router::new().route("/metrics", get(|| async move {
metrics.prometheus_output()
}));
let listener= tokio::net::TcpListener::bind(addr).await.unwrap();
axum::serve(listener, app).await.unwrap()
});
});
info!("Fetching jobs from {}", &queue_name);