mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 09:26:29 +03:00
always init
This commit is contained in:
@@ -338,45 +338,8 @@ impl Context {
|
|||||||
events: Events,
|
events: Events,
|
||||||
stock_strings: StockStrings,
|
stock_strings: StockStrings,
|
||||||
) -> Result<Context> {
|
) -> 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 =
|
let context =
|
||||||
Self::new_closed(dbfile, id, events, stock_strings, Default::default()).await?;
|
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.
|
// Open the database if is not encrypted.
|
||||||
if context.check_passphrase("".to_string()).await? {
|
if context.check_passphrase("".to_string()).await? {
|
||||||
context.sql.open(&context, "".to_string()).await?;
|
context.sql.open(&context, "".to_string()).await?;
|
||||||
@@ -493,6 +456,17 @@ impl Context {
|
|||||||
inner: Arc::new(inner),
|
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)
|
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)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use anyhow::Context as _;
|
use anyhow::Context as _;
|
||||||
|
|||||||
Reference in New Issue
Block a user