cln-plugin: trace level logging support

Changelog-None

Author: daywalker90

plugins/examples/cln-plugin-startup.rs

@@ -76,6 +76,7 @@ async fn main() -> Result<(), anyhow::Error> {
             "send a test_custom_notification event",
             test_send_custom_notification,
         )
+        .rpcmethod("test-log-levels", "send on all log levels", test_log_levels)
         .subscribe("connect", connect_handler)
         .subscribe("test_custom_notification", test_receive_custom_notification)
         .hook("peer_connected", peer_connected_handler)
@@ -161,3 +162,15 @@ async fn peer_connected_handler(
     log::info!("Got a connect hook call: {}", v);
     Ok(json!({"result": "continue"}))
 }
+
+async fn test_log_levels(
+    _p: Plugin<()>,
+    _v: serde_json::Value,
+) -> Result<serde_json::Value, Error> {
+    log::trace!("log::trace! working");
+    log::debug!("log::debug! working");
+    log::info!("log::info! working");
+    log::warn!("log::warn! working");
+    log::error!("log::error! working");
+    Ok(json!({}))
+}

plugins/src/logging.rs

@@ -22,6 +22,7 @@ enum LogLevel {
     Info,
     Warn,
     Error,
+    Trace,
 }
 
 impl From<log::Level> for LogLevel {
@@ -30,7 +31,8 @@ impl From<log::Level> for LogLevel {
             log::Level::Error => LogLevel::Error,
             log::Level::Warn => LogLevel::Warn,
             log::Level::Info => LogLevel::Info,
-            log::Level::Debug | log::Level::Trace => LogLevel::Debug,
+            log::Level::Debug => LogLevel::Debug,
+            log::Level::Trace => LogLevel::Trace,
         }
     }
 }
@@ -130,7 +132,7 @@ mod trace {
                 &Level::ERROR => LogLevel::Error,
                 &Level::INFO => LogLevel::Info,
                 &Level::WARN => LogLevel::Warn,
-                &Level::TRACE => LogLevel::Debug,
+                &Level::TRACE => LogLevel::Trace,
             }
         }
     }

tests/test_cln_rs.py

@@ -105,6 +105,20 @@ def test_plugin_options_handle_defaults(node_factory):
     assert opts["multi-i64-option-default"] == [-42]
 
 
+def test_plugin_log_levels(node_factory):
+    """Start a minimal plugin and ensure it logs all levels"""
+    bin_path = Path.cwd() / "target" / RUST_PROFILE / "examples" / "cln-plugin-startup"
+    l1 = node_factory.get_node(
+        options={"plugin": str(bin_path)}, broken_log=r"log::error! working"
+    )
+    l1.rpc.test_log_levels()
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::trace! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::debug! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::info! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::warn! working"))
+    wait_for(lambda: l1.daemon.is_in_log(r"cln-plugin-startup: log::error! working"))
+
+
 def test_grpc_connect(node_factory):
     """Attempts to connect to the grpc interface and call getinfo"""
     # These only exist if we have rust!