From 6d722ba8eba6f5963fedba57a39b8b8ca1f86bdc Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Sun, 28 Apr 2024 17:30:14 +0200 Subject: [PATCH] re-exports & prelude --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/lib.rs | 16 +++++++++++----- src/main.rs | 3 +-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7711baa..894d691 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2574,7 +2574,7 @@ dependencies = [ [[package]] name = "twba-common" -version = "0.2.0" +version = "0.2.1" dependencies = [ "tracing", "tracing-appender", diff --git a/Cargo.toml b/Cargo.toml index 94d604d..5eebac4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "twba-common" -version = "0.2.0" +version = "0.2.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/lib.rs b/src/lib.rs index 89e530d..88ef40e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,10 +1,16 @@ -use tracing::{info, Level}; +use tracing::Level; use tracing_appender::non_blocking::{NonBlocking, WorkerGuard}; use tracing_appender::rolling::Rotation; use tracing_subscriber::fmt::writer::{MakeWriterExt, WithMaxLevel}; use tracing_subscriber::fmt::{Layer, Subscriber}; use tracing_subscriber::layer::SubscriberExt; -use twba_backup_config::Conf; +pub mod prelude { + pub use crate::{get_config, init_tracing}; + pub use tracing::{debug, error, info, instrument, trace, warn}; + pub use twba_backup_config::{self, Conf}; + pub use twba_local_db; +} +use prelude::*; pub fn get_config() -> Conf { twba_backup_config::get_default_builder() @@ -13,9 +19,9 @@ pub fn get_config() -> Conf { } pub fn init_tracing(crate_name: &str) -> Vec { - let (guard1, warn_file) = file_tracer(crate_name, Level::WARN, Rotation::HOURLY); - let (guard2, info_file) = file_tracer(crate_name, Level::INFO, Rotation::HOURLY); - let (guard3, trace_file) = file_tracer(crate_name, Level::TRACE, Rotation::HOURLY); + let (guard1, warn_file) = file_tracer(crate_name, Level::WARN, Rotation::DAILY); + let (guard2, info_file) = file_tracer(crate_name, Level::INFO, Rotation::DAILY); + let (guard3, trace_file) = file_tracer(crate_name, Level::TRACE, Rotation::DAILY); let file_subscriber = Subscriber::builder() .with_env_filter(format!("warn,{}=trace", crate_name)) diff --git a/src/main.rs b/src/main.rs index b530762..1c82fe1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,4 @@ -use tracing::*; -use twba_common::init_tracing; +use twba_common::prelude::*; pub fn main() { let _guard = init_tracing("twba_common");