Skip to content

Commit 48dfb19

Browse files
committed
fixup! fixup! fixup! refactor(log): reimplement log using tracing
1 parent 6d54875 commit 48dfb19

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

src/currentprocess.rs

+4-24
Original file line numberDiff line numberDiff line change
@@ -163,30 +163,10 @@ fn ensure_hook() {
163163
}
164164

165165
fn tracing_subscriber() -> impl tracing::Subscriber {
166-
use tracing_subscriber::{
167-
filter::{EnvFilter, LevelFilter},
168-
layer::SubscriberExt,
169-
Layer, Registry,
170-
};
171-
172-
let curr_process = process();
173-
let maybe_directives = curr_process.var_os("RUST_LOG").clone();
174-
let logger = tracing_subscriber::fmt::layer()
175-
.with_writer(move || curr_process.stderr())
176-
.with_ansi(false);
177-
let console_logger = if let Some(directives) = maybe_directives {
178-
let env_filter = EnvFilter::builder()
179-
.with_default_directive(LevelFilter::INFO.into())
180-
.parse_lossy(directives.to_string_lossy());
181-
logger.compact().with_filter(env_filter).boxed()
182-
} else {
183-
// Receive log lines from Rustup only.
184-
let env_filter = EnvFilter::new("rustup=DEBUG");
185-
logger
186-
.event_format(crate::cli::log::EventFormatter)
187-
.with_filter(env_filter)
188-
.boxed()
189-
};
166+
use tracing_subscriber::{layer::SubscriberExt, Registry};
167+
168+
let console_logger = crate::cli::log::console_logger(process());
169+
190170
// TODO: What about the original otel logger?
191171
Registry::default().with(console_logger)
192172
}

0 commit comments

Comments
 (0)