Skip to content

Commit

Permalink
Use sp_tracing in bridges/relays/utils/src/initialize.rs and keep the…
Browse files Browse the repository at this point in the history
… formats and filtering used
  • Loading branch information
Safrout1 committed Jul 28, 2024
1 parent 50a54d1 commit 8980035
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bridges/relays/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async-trait = { workspace = true }
backoff = { workspace = true }
console = { workspace = true }
isahc = { workspace = true }
env_logger = { workspace = true }
sp-tracing = { workspace = true }
futures = { workspace = true }
jsonpath_lib = { workspace = true }
log = { workspace = true }
Expand Down
54 changes: 19 additions & 35 deletions bridges/relays/utils/src/initialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
use console::style;
use parking_lot::Mutex;
use std::{cell::RefCell, fmt::Display, io::Write};
use sp_tracing::tracing_subscriber;
use sp_tracing::tracing::Level;
use sp_tracing::tracing_subscriber::fmt::time::OffsetTime;
use sp_tracing::tracing_subscriber::fmt::SubscriberBuilder;
use sp_tracing::tracing_subscriber::EnvFilter;

/// Relayer version that is provided as metric. Must be set by a binary
/// (get it with `option_env!("CARGO_PKG_VERSION")` from a binary package code).
Expand All @@ -41,42 +46,21 @@ pub fn initialize_logger(with_timestamp: bool) {
)
.expect("static format string is valid");

let mut builder = env_logger::Builder::new();
builder.filter_level(log::LevelFilter::Warn);
builder.filter_module("bridge", log::LevelFilter::Info);
builder.parse_default_env();
if with_timestamp {
builder.format(move |buf, record| {
let timestamp = time::OffsetDateTime::now_local()
.unwrap_or_else(|_| time::OffsetDateTime::now_utc());
let timestamp = timestamp.format(&format).unwrap_or_else(|_| timestamp.to_string());

let log_level = color_level(record.level());
let log_target = color_target(record.target());
let timestamp = if cfg!(windows) {
Either::Left(timestamp)
} else {
Either::Right(style(timestamp).black().bright().bold().to_string())
};

writeln!(
buf,
"{}{} {} {} {}",
loop_name_prefix(),
timestamp,
log_level,
log_target,
record.args(),
)
});
} else {
builder.format(move |buf, record| {
let log_level = color_level(record.level());
let log_target = color_target(record.target());
let local_time = OffsetTime::new(
time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC),
format,
);

writeln!(buf, "{}{log_level} {log_target} {}", loop_name_prefix(), record.args(),)
});
}
let builder = SubscriberBuilder::default()
.with_env_filter(EnvFilter::from_default_env())
.with_filter(Level::WARN)
.with_filter_module("bridge", Level::INFO);

let builder = if with_timestamp {
builder.with_timer(local_time)
} else {
builder.without_time()
};

builder.init();
}
Expand Down

0 comments on commit 8980035

Please sign in to comment.