Move tracing_subscriber to deltachat-rpc-server

This commit is contained in:
link2xt
2024-05-18 17:57:32 +00:00
parent 6bcb347426
commit 97695d7e19
4 changed files with 12 additions and 39 deletions

View File

@@ -13,7 +13,6 @@ use async_channel::{self as channel, Receiver, Sender};
use pgp::SignedPublicKey;
use ratelimit::Ratelimit;
use tokio::sync::{Mutex, Notify, OnceCell, RwLock};
use tracing_subscriber::{prelude::*, EnvFilter};
use crate::aheader::EncryptPreference;
use crate::chat::{get_chat_cnt, ChatId, ProtectionStatus};
@@ -456,17 +455,6 @@ impl Context {
inner: Arc::new(inner),
};
tracing_subscriber::registry()
.with(tracing_subscriber::fmt::layer().with_writer(std::io::stderr))
// .with(DeltaLayer(ctx.clone()))
.with(
EnvFilter::builder()
.with_default_directive(tracing_subscriber::filter::LevelFilter::DEBUG.into())
.from_env_lossy(),
)
.try_init()
.ok();
Ok(ctx)
}
@@ -1424,32 +1412,6 @@ impl tracing::field::Visit for CollectVisitor {
}
}
// set the RUST_LOG env var to one of {debug,info,warn} to see logging info
struct DeltaLayer(Context);
impl<S: tracing::Subscriber> tracing_subscriber::Layer<S> for DeltaLayer {
fn on_event(
&self,
event: &tracing::Event<'_>,
_ctx: tracing_subscriber::layer::Context<'_, S>,
) {
let mut visitor = CollectVisitor::default();
event.record(&mut visitor);
use tracing::Level;
let out_event = if event.metadata().level() == &Level::WARN {
EventType::Warning(format!("{:?}", visitor))
} else if event.metadata().level() == &Level::ERROR {
EventType::Error(format!("{:?}", visitor))
} else {
EventType::Info(format!("{:?}", visitor))
};
self.0.emit_event(out_event);
}
}
#[cfg(test)]
mod tests {
use anyhow::Context as _;