From ccc675b304139b783975b1c78c260c6ccc5c840c Mon Sep 17 00:00:00 2001
From: cloudhead <cloudhead@radicle.xyz>
Date: Wed, 17 Jan 2024 13:21:28 +0100
Subject: [PATCH] cli: Have a way of enabling logging in helper

Log to stderr if RUST_LOG is enabled in the remote helper.
---
 Cargo.lock                                  |  1 +
 radicle-remote-helper/Cargo.toml            |  3 +-
 radicle-remote-helper/src/git-remote-rad.rs |  3 ++
 radicle/src/logger.rs                       | 43 +++++++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90342d28..f4d0ba47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2613,6 +2613,7 @@ dependencies = [
 name = "radicle-remote-helper"
 version = "0.2.0"
 dependencies = [
+ "log",
  "radicle",
  "radicle-cli",
  "radicle-crypto",
diff --git a/radicle-remote-helper/Cargo.toml b/radicle-remote-helper/Cargo.toml
index a52965b4..051b15ee 100644
--- a/radicle-remote-helper/Cargo.toml
+++ b/radicle-remote-helper/Cargo.toml
@@ -7,7 +7,8 @@ edition = "2021"
 build = "../build.rs"
 
 [dependencies]
-thiserror = "1"
+thiserror = { version = "1" }
+log = { version = "0.4.17" }
 radicle-git-ext = { version = "0.7.0" }
 
 [dependencies.radicle]
diff --git a/radicle-remote-helper/src/git-remote-rad.rs b/radicle-remote-helper/src/git-remote-rad.rs
index c33a5d5a..0ec0d833 100644
--- a/radicle-remote-helper/src/git-remote-rad.rs
+++ b/radicle-remote-helper/src/git-remote-rad.rs
@@ -10,6 +10,9 @@ pub const GIT_HEAD: &str = env!("GIT_HEAD");
 fn main() {
     let mut args = env::args();
 
+    if let Some(lvl) = radicle::logger::env_level() {
+        radicle::logger::set(radicle::logger::StderrLogger::new(lvl), lvl).ok();
+    }
     if args.nth(1).as_deref() == Some("--version") {
         if let Err(e) = version::print(std::io::stdout(), NAME, VERSION, GIT_HEAD) {
             eprintln!("error: {e}");
diff --git a/radicle/src/logger.rs b/radicle/src/logger.rs
index 80b0d2b9..2b38ac84 100644
--- a/radicle/src/logger.rs
+++ b/radicle/src/logger.rs
@@ -5,13 +5,15 @@
 #[cfg(feature = "test")]
 pub mod test;
 
-use std::io::{self, Write};
+use std::io;
+use std::io::Write;
 
 use chrono::prelude::*;
 use colored::*;
 use log::{Level, Log, Metadata, Record, SetLoggerError};
 
-struct Logger {
+/// A logger that logs to `stdout`.
+pub struct Logger {
     level: Level,
 }
 
@@ -44,8 +46,38 @@ impl Log for Logger {
                 Level::Debug => message.dimmed(),
                 Level::Trace => message.white().dimmed(),
             };
+            writeln!(&mut io::stdout(), "{message}").expect("write shouldn't fail");
+        }
+    }
 
-            writeln!(io::stdout(), "{message}").expect("write shouldn't fail");
+    fn flush(&self) {}
+}
+
+/// A logger that logs to `stderr`.
+pub struct StderrLogger {
+    level: Level,
+}
+
+impl StderrLogger {
+    pub fn new(level: Level) -> Self {
+        Self { level }
+    }
+}
+
+impl Log for StderrLogger {
+    fn enabled(&self, metadata: &Metadata) -> bool {
+        metadata.level() <= self.level
+    }
+
+    fn log(&self, record: &Record) {
+        if self.enabled(record.metadata()) {
+            let message = format!(
+                "{:<5} {:<8} {}",
+                record.level(),
+                record.target(),
+                record.args()
+            );
+            writeln!(&mut io::stderr(), "{message}").expect("write shouldn't fail");
         }
     }
 
@@ -54,8 +86,11 @@ impl Log for Logger {
 
 /// Initialize a new logger.
 pub fn init(level: Level) -> Result<(), SetLoggerError> {
-    let logger = Logger { level };
+    set(Logger { level }, level)
+}
 
+/// Set a logger.
+pub fn set(logger: impl Log + 'static, level: Level) -> Result<(), SetLoggerError> {
     log::set_boxed_logger(Box::new(logger))?;
     log::set_max_level(level.to_level_filter());