daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and load test

Browse Source
This commit is contained in:
Dominik Werder
2023-07-21 23:06:15 +02:00
parent 9314c58a9b
commit 7c26b72537
16 changed files with 171 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/taskrun/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "taskrun"
version = "0.0.3"
version = "0.0.4"
authors = ["Dominik Werder <dominik.werder@gmail.com>"]
edition = "2021"
@@ -8,13 +8,13 @@ edition = "2021"
path = "src/taskrun.rs"
[dependencies]
futures-util = "0.3"
tokio = { version = "1.21.2", features = ["rt-multi-thread", "io-util", "net", "time", "sync", "fs", "tracing"] }
tokio = { version = "1.29.1", features = ["full", "tracing"] }
futures-util = "0.3.28"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["fmt", "time"] }
tracing-subscriber = { version = "0.3.17", features = ["fmt", "time"] }
#tracing-loki = { version = "0.2.1", default-features = false, features = ["compat-0-2-1"] }
console-subscriber = { version = "0.1.10" }
time = { version = "0.3", features = ["formatting"] }
console-subscriber = "0.1.5"
backtrace = "0.3.56"
lazy_static = "1.4.0"
chrono = "0.4"

32
crates/taskrun/src/taskrun.rs
View File

@@ -1,3 +1,5 @@
pub use tokio;
use crate::log::*;
use err::Error;
use std::fmt;
@@ -85,7 +87,8 @@ where
eprintln!("ERROR tracing: can not init");
}
}
let res = runtime.block_on(async { fut.await });
// let res = runtime.block_on(async { fut.await });
let res = runtime.block_on(fut);
match res {
Ok(k) => Ok(k),
Err(e) => {
@@ -115,13 +118,24 @@ fn tracing_init_inner() -> Result<(), Error> {
.with_ansi(false)
.with_thread_names(true)
.with_filter(filter);
let z = tracing_subscriber::registry().with(fmt_layer);
#[cfg(CONSOLE)]
{
let console_layer = console_subscriber::spawn();
let z = z.with(console_layer);
}
z.try_init().map_err(|e| format!("{e}"))?;
let console_layer = console_subscriber::ConsoleLayer::builder()
.retention(std::time::Duration::from_secs(4))
.server_addr(([127, 0, 0, 1], 2875))
.spawn();
// .build();
// eprintln!("spawn console sever");
// tokio::spawn(console_server.serve());
let reg = tracing_subscriber::registry().with(console_layer);
let reg = reg.with(fmt_layer);
reg.try_init().map_err(|e| {
eprintln!("SOMETHING BAD HAPPENED: {e}");
format!("{e}")
})?;
}
#[cfg(DISABLED_LOKI)]
// TODO tracing_loki seems not well composable, try open telemetry instead.
@@ -176,7 +190,7 @@ pub fn tracing_init() -> Result<(), ()> {
} else if *initg == 1 {
Ok(())
} else {
eprintln!("ERROR Unknown tracing state");
eprintln!("ERROR unknown tracing state");
Err(())
}
}