Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
ybbh committed Oct 10, 2023
2 parents ac2e9f2 + 35ec722 commit d6ac048
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
19 changes: 13 additions & 6 deletions src/init_logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,26 @@ use tracing_subscriber::Layer;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt;

static INIT: Once = Once::new();
pub static INIT: Once = Once::new();

static INIT_ENV: Once = Once::new();

pub fn logger_setup_with_console() {
INIT.call_once(
|| { _setup_with_console(); }
|| { _setup_with_console("info"); }
);
}

pub fn _setup_with_console() {

pub fn _setup_with_console(level:&str) {
let filter = match level {
"info" => { tracing_subscriber::filter::LevelFilter::INFO }
"debug" => { tracing_subscriber::filter::LevelFilter::DEBUG }
"trace" => { tracing_subscriber::filter::LevelFilter::TRACE }
"warn" => { tracing_subscriber::filter::LevelFilter::WARN }
"error" => { tracing_subscriber::filter::LevelFilter::ERROR }
_ => { panic!("unknown level {}", level)}
};
let console_layer = console_subscriber::spawn();
tracing_subscriber::registry()
.with(console_layer)
Expand All @@ -28,9 +37,7 @@ pub fn _setup_with_console() {
// display source code line numbers
.with_line_number(true)
.without_time()
.with_filter(
tracing_subscriber::filter::LevelFilter::DEBUG
),
.with_filter(filter),
)
.init();
}
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ pub mod get_exec;
pub mod res_of;
pub mod backtrace;
pub mod ts_node_context_string;
pub mod logger;
7 changes: 7 additions & 0 deletions src/logger.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use crate::init_logger::{_setup_with_console, INIT};

pub fn logger_setup(level:&str) {
INIT.call_once(
|| { _setup_with_console(level); }
);
}

0 comments on commit d6ac048

Please sign in to comment.