From da3c41d89933f9ae8f6201c53a4e1dc983a84898 Mon Sep 17 00:00:00 2001
From: Giacomo Pasini <g.pasini98@gmail.com>
Date: Mon, 6 Nov 2023 23:03:13 +0100
Subject: [PATCH 1/2] Add option to provide custom writer to the logger backend

---
 nomos-services/log/src/lib.rs | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/nomos-services/log/src/lib.rs b/nomos-services/log/src/lib.rs
index 46f2115ff..e200da196 100644
--- a/nomos-services/log/src/lib.rs
+++ b/nomos-services/log/src/lib.rs
@@ -2,6 +2,9 @@
 use futures::StreamExt;
 use std::net::SocketAddr;
 use std::path::PathBuf;
+use std::sync::{Arc, Mutex};
+use std::io::Write;
+use std::fmt::{Debug, Formatter};
 // crates
 use serde::{Deserialize, Serialize};
 use tracing::{error, Level};
@@ -21,6 +24,38 @@ pub struct Logger {
     worker_guard: Option<WorkerGuard>,
 }
 
+/// This is a wrapper around a writer to allow cloning which is
+/// required by contract by Overwatch for a configuration struct
+#[derive(Clone)]
+pub struct SharedWriter {
+    inner: Arc<Mutex<Box<dyn Write + Send + Sync>>>
+}
+
+impl Write for SharedWriter {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.inner.lock().unwrap().write(buf)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        self.inner.lock().unwrap().flush()
+    }
+}
+
+impl SharedWriter {
+    pub fn new<W: Write + Send + Sync + 'static>(writer: W) -> Self {
+        Self {
+            inner: Arc::new(Mutex::new(Box::new(writer)))
+        }
+    }
+}
+
+impl Debug for SharedWriter {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("SharedWriter")
+            .finish()
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum LoggerBackend {
     Gelf {
@@ -32,6 +67,8 @@ pub enum LoggerBackend {
     },
     Stdout,
     Stderr,
+    #[serde(skip)]
+    Writer(SharedWriter),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -121,6 +158,7 @@ impl ServiceCore for Logger {
             }
             LoggerBackend::Stdout => tracing_appender::non_blocking(std::io::stdout()),
             LoggerBackend::Stderr => tracing_appender::non_blocking(std::io::stderr()),
+            LoggerBackend::Writer(writer) => tracing_appender::non_blocking(writer),
         };
 
         let layer = tracing_subscriber::fmt::Layer::new()

From d16daf09b73575c66e4210bfe845722d75e00257 Mon Sep 17 00:00:00 2001
From: Giacomo Pasini <g.pasini98@gmail.com>
Date: Tue, 7 Nov 2023 10:24:42 +0100
Subject: [PATCH 2/2] fmt

---
 nomos-services/log/src/lib.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nomos-services/log/src/lib.rs b/nomos-services/log/src/lib.rs
index e200da196..8ccfa7fa1 100644
--- a/nomos-services/log/src/lib.rs
+++ b/nomos-services/log/src/lib.rs
@@ -1,10 +1,10 @@
 // std
 use futures::StreamExt;
+use std::fmt::{Debug, Formatter};
+use std::io::Write;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
-use std::io::Write;
-use std::fmt::{Debug, Formatter};
 // crates
 use serde::{Deserialize, Serialize};
 use tracing::{error, Level};
@@ -28,7 +28,7 @@ pub struct Logger {
 /// required by contract by Overwatch for a configuration struct
 #[derive(Clone)]
 pub struct SharedWriter {
-    inner: Arc<Mutex<Box<dyn Write + Send + Sync>>>
+    inner: Arc<Mutex<Box<dyn Write + Send + Sync>>>,
 }
 
 impl Write for SharedWriter {
@@ -44,15 +44,14 @@ impl Write for SharedWriter {
 impl SharedWriter {
     pub fn new<W: Write + Send + Sync + 'static>(writer: W) -> Self {
         Self {
-            inner: Arc::new(Mutex::new(Box::new(writer)))
+            inner: Arc::new(Mutex::new(Box::new(writer))),
         }
     }
 }
 
 impl Debug for SharedWriter {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("SharedWriter")
-            .finish()
+        f.debug_struct("SharedWriter").finish()
     }
 }