Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-21 15:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

always init

Browse Source
This commit is contained in:
dignifiedquire
2024-05-18 14:47:42 +02:00
parent 96d43b6084
commit a1649a8258
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/context.rs
View File

@@ -338,45 +338,8 @@ impl Context {
events: Events,
stock_strings: StockStrings,
) -> Result<Context> {
// 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);
}
}
let context =
Self::new_closed(dbfile, id, events, stock_strings, Default::default()).await?;
tracing_subscriber::registry()
// .with(tracing_subscriber::fmt::layer().with_writer(std::io::stdout))
.with(DeltaLayer(context.clone()))
.with(
EnvFilter::builder()
.with_default_directive(tracing_subscriber::filter::LevelFilter::DEBUG.into())
.from_env_lossy(),
)
.try_init()
.ok();
// Open the database if is not encrypted.
if context.check_passphrase("".to_string()).await? {
context.sql.open(&context, "".to_string()).await?;
@@ -493,6 +456,17 @@ impl Context {
inner: Arc::new(inner),
};
tracing_subscriber::registry()
// .with(tracing_subscriber::fmt::layer().with_writer(std::io::stdout))
.with(DeltaLayer(ctx.clone()))
.with(
EnvFilter::builder()
.with_default_directive(tracing_subscriber::filter::LevelFilter::DEBUG.into())
.from_env_lossy(),
)
.try_init()
.ok();
Ok(ctx)
}
@@ -1450,6 +1424,32 @@ 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 _;