From 407b98d3a2cfe6e457a87f8a77ec9206ddc9e76b Mon Sep 17 00:00:00 2001
From: binarybaron <86064887+binarybaron@users.noreply.github.com>
Date: Tue, 18 Jan 2022 22:34:47 +0100
Subject: [PATCH] Always write logs as JSON to files

---
 CHANGELOG.md            |  1 +
 swap/src/cli/tracing.rs | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c65088c1..d6722ea7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Revert logs to use rfc3339 local time formatting.
+- Always write logs as JSON to files
 
 ## [0.10.2] - 2021-12-25
 
diff --git a/swap/src/cli/tracing.rs b/swap/src/cli/tracing.rs
index 5ed58231..3bafc229 100644
--- a/swap/src/cli/tracing.rs
+++ b/swap/src/cli/tracing.rs
@@ -20,27 +20,22 @@ pub fn init(debug: bool, json: bool, dir: impl AsRef<Path>, swap_id: Option<Uuid
 
         std::mem::forget(guard);
 
-        let file_logger = fmt::layer()
-            .with_ansi(false)
-            .with_target(false)
-            .with_writer(appender);
+        let file_logger = registry.with(
+            fmt::layer()
+                .with_ansi(false)
+                .with_target(false)
+                .json()
+                .with_writer(appender),
+        );
 
         if json && debug {
-            set_global_default(
-                registry
-                    .with(file_logger.json())
-                    .with(debug_json_terminal_printer()),
-            )?;
+            set_global_default(file_logger.with(debug_json_terminal_printer()))?;
         } else if json && !debug {
-            set_global_default(
-                registry
-                    .with(file_logger.json())
-                    .with(info_json_terminal_printer()),
-            )?;
+            set_global_default(file_logger.with(info_json_terminal_printer()))?;
         } else if !json && debug {
-            set_global_default(registry.with(file_logger).with(debug_terminal_printer()))?;
+            set_global_default(file_logger.with(debug_terminal_printer()))?;
         } else {
-            set_global_default(registry.with(file_logger).with(info_terminal_printer()))?;
+            set_global_default(file_logger.with(info_terminal_printer()))?;
         }
 
         Ok(())