From 3bd9f4671c43d857246e2dcd655d7b2aa8237017 Mon Sep 17 00:00:00 2001 From: Aaron Blankstein Date: Mon, 10 Jul 2023 11:02:45 -0500 Subject: [PATCH] feat: ignore logging errors rather than panicking --- stacks-common/src/util/log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stacks-common/src/util/log.rs b/stacks-common/src/util/log.rs index 26de14e676..73463cc45f 100644 --- a/stacks-common/src/util/log.rs +++ b/stacks-common/src/util/log.rs @@ -205,8 +205,8 @@ fn make_json_logger() -> Logger { }), ); - let drain = Mutex::new(slog_json::Json::default(std::io::stderr())).map(slog::Fuse); - let filtered_drain = slog::LevelFilter::new(drain, get_loglevel()).fuse(); + let drain = Mutex::new(slog_json::Json::default(std::io::stderr())); + let filtered_drain = slog::LevelFilter::new(drain, get_loglevel()).ignore_res(); slog::Logger::root(filtered_drain, def_keys) } @@ -225,7 +225,7 @@ fn make_logger() -> Logger { let decorator = slog_term::PlainSyncDecorator::new(std::io::stderr()); let atty = isatty(Stream::Stderr); let drain = TermFormat::new(decorator, pretty_print, debug, atty); - let logger = Logger::root(drain.fuse(), o!()); + let logger = Logger::root(drain.ignore_res(), o!()); logger } } @@ -239,7 +239,7 @@ fn make_logger() -> Logger { let plain = slog_term::PlainSyncDecorator::new(slog_term::TestStdoutWriter); let isatty = isatty(Stream::Stdout); let drain = TermFormat::new(plain, false, debug, isatty); - let logger = Logger::root(drain.fuse(), o!()); + let logger = Logger::root(drain.ignore_res(), o!()); logger } }