Просмотр исходного кода

util/logger,util/cli,bin/app/logger: fix issues with file logging

- log not saved to file because NonBlocking guard was dropped early in util/cli
- colored ansi text used for file logging
oars 9 месяцев назад
Родитель
Сommit
52e3d4655b
3 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      bin/app/src/logger.rs
  2. 3 1
      src/util/cli.rs
  3. 1 1
      src/util/logger.rs

+ 1 - 1
bin/app/src/logger.rs

@@ -81,7 +81,7 @@ pub fn setup_logging() -> Option<WorkerGuard> {
         ));
 
         let file_layer = tracing_subscriber::fmt::Layer::new()
-            .event_format(EventFormatter::new(true, true))
+            .event_format(EventFormatter::new(false, true))
             .fmt_fields(tracing_subscriber::fmt::format::debug_fn(
                 darkfi::util::logger::file_field_formatter,
             ))

+ 3 - 1
src/util/cli.rs

@@ -164,6 +164,7 @@ macro_rules! async_daemonize {
                 }
             };
 
+            let mut _file_guard = None;
             // If a log file has been configured, create a terminal and file logger.
             // Otherwise, output to terminal logger only.
             match args.log {
@@ -184,7 +185,8 @@ macro_rules! async_daemonize {
                     };
 
                     // hold guard until process stops to ensure buffer logs are flushed to file
-                    let (non_blocking, _guard) = tracing_appender::non_blocking(log_file);
+                    let (non_blocking, guard) = tracing_appender::non_blocking(log_file);
+                    _file_guard = Some(guard);
                     if let Err(e) =
                         darkfi::util::logger::setup_logging(args.verbose, Some(non_blocking))
                     {

+ 1 - 1
src/util/logger.rs

@@ -433,7 +433,7 @@ pub fn setup_logging(verbosity_level: u8, log_file: Option<NonBlocking>) -> Resu
     let file_layer = log_file.map(|log_file| {
         FmtLayer::new()
             .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE)
-            .event_format(EventFormatter::new(true, true))
+            .event_format(EventFormatter::new(false, true))
             .fmt_fields(file_field_format)
             .with_writer(log_file)
     });