Skip to content

use tracing indicatif to sync tracing and progress bar rendering #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2024
Merged

use tracing indicatif to sync tracing and progress bar rendering #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dsc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ sysinfo = { version = "0.29.10" }
thiserror = "1.0.52"
tracing = { version = "0.1.37" }
tracing-subscriber = { version = "0.3.17", features = ["ansi", "env-filter", "json"] }
tracing-indicatif = { version = "0.3.6" }
6 changes: 4 additions & 2 deletions dsc/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use syntect::{
};
use tracing::{Level, debug, error, trace};
use tracing_subscriber::{filter::EnvFilter, layer::SubscriberExt, Layer};
use tracing_indicatif::IndicatifLayer;

pub const EXIT_SUCCESS: i32 = 0;
pub const EXIT_INVALID_ARGS: i32 = 1;
Expand Down Expand Up @@ -268,7 +269,8 @@ pub fn enable_tracing(trace_level: &TraceLevel, trace_format: &TraceFormat) {
.or_else(|_| EnvFilter::try_new("warning"))
.unwrap_or_default()
.add_directive(tracing_level.into());
let layer = tracing_subscriber::fmt::Layer::default().with_writer(std::io::stderr);
let indicatif_layer = IndicatifLayer::new();
let layer = tracing_subscriber::fmt::Layer::default().with_writer(indicatif_layer.get_stderr_writer());
let fmt = match trace_format {
TraceFormat::Default => {
layer
Expand All @@ -294,7 +296,7 @@ pub fn enable_tracing(trace_level: &TraceLevel, trace_format: &TraceFormat) {
}
};

let subscriber = tracing_subscriber::Registry::default().with(fmt).with(filter);
let subscriber = tracing_subscriber::Registry::default().with(fmt).with(filter).with(indicatif_layer);

if tracing::subscriber::set_global_default(subscriber).is_err() {
eprintln!("Unable to set global default tracing subscriber. Tracing is diabled.");
Expand Down