pass env filter reload handle to libsql-server lib

Author: MarinPostma

libsql-server/src/lib.rs

@@ -181,6 +181,7 @@ pub struct Server<C = HttpConnector, A = AddrIncoming, D = HttpsConnector<HttpCo
     pub should_sync_from_storage: bool,
     pub force_load_wals: bool,
     pub sync_conccurency: usize,
+    pub set_log_level: Option<Box<dyn Fn(&str) -> anyhow::Result<()> + Send +'static>>
 }
 
 impl<C, A, D> Default for Server<C, A, D> {
@@ -210,6 +211,7 @@ impl<C, A, D> Default for Server<C, A, D> {
             should_sync_from_storage: false,
             force_load_wals: false,
             sync_conccurency: 8,
+            set_log_level: None,
         }
     }
 }

libsql-server/src/main.rs

@@ -1,6 +1,7 @@
 use std::env;
 use std::net::SocketAddr;
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::{bail, Context as _, Result};
@@ -10,7 +11,7 @@ use hyper::client::HttpConnector;
 use libsql_server::auth::{parse_http_basic_auth_arg, parse_jwt_keys, user_auth_strategies, Auth};
 use tokio::sync::Notify;
 use tokio::time::Duration;
-use tracing_subscriber::prelude::*;
+use tracing_subscriber::{prelude::*, EnvFilter};
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::Layer;
 
@@ -641,7 +642,7 @@ fn make_meta_store_config(config: &Cli) -> anyhow::Result<MetaStoreConfig> {
     })
 }
 
-async fn build_server(config: &Cli) -> anyhow::Result<Server> {
+async fn build_server(config: &Cli, set_log_level: impl Fn(&str) -> anyhow::Result<()> + Send + 'static) -> anyhow::Result<Server> {
     let db_config = make_db_config(config)?;
     let user_api_config = make_user_api_config(config).await?;
     let admin_api_config = make_admin_api_config(config).await?;
@@ -709,6 +710,7 @@ async fn build_server(config: &Cli) -> anyhow::Result<Server> {
         should_sync_from_storage: config.sync_from_storage,
         force_load_wals: config.force_load_wals,
         sync_conccurency: config.sync_conccurency,
+        set_log_level: Some(Box::new(set_log_level)),
     })
 }
 
@@ -748,16 +750,23 @@ async fn main() -> Result<()> {
     #[cfg(feature = "debug-tools")]
     enable_libsql_logging();
 
+    let (filter, reload_handle) = tracing_subscriber::reload::Layer::new(tracing_subscriber::EnvFilter::from_default_env());
+    let set_log_level = move |s: &str| -> anyhow::Result<()> {
+        let filter = EnvFilter::from_str(s)?;
+        reload_handle.reload(filter)?;
+        Ok(())
+    };
+
     registry
         .with(
             tracing_subscriber::fmt::layer()
                 .with_ansi(false)
-                .with_filter(tracing_subscriber::EnvFilter::from_default_env()),
+                .with_filter(filter),
         )
         .init();
 
     args.print_welcome_message();
-    let server = build_server(&args).await?;
+    let server = build_server(&args, set_log_level).await?;
     server.start().await?;
 
     Ok(())