Skip to content

Commit 6cca42c

Browse files
RaulTrombinpatrickelectric
authored andcommitted
src: logger: Change parameter to be log_include_all_dependencies, default log ping-viewer-next and current application
1 parent 6f9dcc4 commit 6cca42c

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

src/logger/manager.rs

+11-9
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,35 @@ pub fn init() {
5959
// Configure the default subscriber
6060
match (
6161
cli::manager::is_tracy(),
62-
cli::manager::log_current_crate_only(),
62+
cli::manager::is_log_all_dependencies(),
6363
) {
64-
(true, true) => {
64+
(true, false) => {
65+
let lib_name = env!("CARGO_PKG_NAME").replace('-', "_");
6566
let subscriber = subscriber.with(EnvFilter::new(format!(
66-
"{}={level}",
67-
env!("CARGO_PKG_NAME").replace('-', "_")
67+
"{lib_name}={level},lib{lib_name}={level}"
6868
)));
6969
let tracy_layer = tracing_tracy::TracyLayer::default();
7070
let subscriber = subscriber.with(tracy_layer);
7171
tracing::subscriber::set_global_default(subscriber)
7272
.expect("Unable to set a global subscriber");
7373
}
74-
(false, true) => {
74+
(false, false) => {
75+
let lib_name = env!("CARGO_PKG_NAME").replace('-', "_");
7576
let subscriber = subscriber.with(EnvFilter::new(format!(
76-
"{}={level}",
77-
env!("CARGO_PKG_NAME").replace('-', "_")
77+
"{lib_name}={level},lib{lib_name}={level}"
7878
)));
7979
tracing::subscriber::set_global_default(subscriber)
8080
.expect("Unable to set a global subscriber");
8181
}
82-
(true, false) => {
82+
(true, true) => {
83+
let subscriber = subscriber.with(EnvFilter::new(level.to_string()));
8384
let tracy_layer = tracing_tracy::TracyLayer::default();
8485
let subscriber = subscriber.with(tracy_layer);
8586
tracing::subscriber::set_global_default(subscriber)
8687
.expect("Unable to set a global subscriber");
8788
}
88-
(false, false) => {
89+
(false, true) => {
90+
let subscriber = subscriber.with(EnvFilter::new(level.to_string()));
8991
tracing::subscriber::set_global_default(subscriber)
9092
.expect("Unable to set a global subscriber");
9193
}

0 commit comments

Comments
 (0)