Merge pull request #35 from nttcom-webcore/feat/log-level-command

ログレベル設定コマンドの追加

README.md

@@ -54,6 +54,11 @@ openssl req -newkey rsa:2048 -nodes -keyout key.pem -x509 -out cert.pem -subj '/
 
 - `cargo run -p moqt-server-sample`
 
+#### ログレベルの指定
+
+- `cargo run -p moqt-server-sample -- -log <Log Level>`
+  - Default setting is `DEBUG`
+
 ### moqt-client-sample の実行
 
 - `cd js && npm install && npm run dev`

moqt-server-sample/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2021"
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 moqt-server = {path = "../moqt-server"}
 tokio = { version = "1.32.0", features = ["rt-multi-thread"] }
+clap = { version = "4.5.4", features = ["derive"] }
 
 
 [features]

moqt-server-sample/src/main.rs

@@ -1,12 +1,22 @@
 use anyhow::{Ok, Result};
+use clap::Parser;
 use moqt_server::{constants::UnderlayType, MOQTConfig, MOQT};
 
+#[derive(Debug, Parser)]
+struct Arg {
+    #[arg(short = 'l', long = "log", help = "Log Level", default_value = "DEBUG")]
+    log_level: String,
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
+    let args = Arg::parse();
+
     let mut config = MOQTConfig::new();
     config.underlay = UnderlayType::WebTransport;
     config.key_path = "./moqt-server-sample/keys/key.pem".to_string();
     config.cert_path = "./moqt-server-sample/keys/cert.pem".to_string();
+    config.log_level = args.log_level.to_string();
 
     // config.auth_callback = Some(|track_name: String, auth_payload: String, auth_callback_type: AuthCallbackType| {Ok(())});
 

moqt-server/src/lib.rs

@@ -39,6 +39,7 @@ pub struct MOQTConfig {
     pub keep_alive_interval_sec: u64,
     pub underlay: UnderlayType,
     pub auth_callback: Option<AuthCallbackFunctionType>,
+    pub log_level: String,
 }
 
 impl Default for MOQTConfig {
@@ -57,6 +58,7 @@ impl MOQTConfig {
             keep_alive_interval_sec: 3,
             underlay: UnderlayType::Both,
             auth_callback: None,
+            log_level: "DEBUG".to_string(),
         }
     }
 }
@@ -68,6 +70,7 @@ pub struct MOQT {
     keep_alive_interval_sec: u64,
     underlay: UnderlayType,
     // auth_callback: Option<AuthCallbackFunctionType>,
+    log_level: String,
 }
 
 impl MOQT {
@@ -79,10 +82,11 @@ impl MOQT {
             keep_alive_interval_sec: config.keep_alive_interval_sec,
             underlay: config.underlay,
             // auth_callback: config.auth_callback,
+            log_level: config.log_level,
         }
     }
     pub async fn start(&self) -> Result<()> {
-        init_logging();
+        init_logging(self.log_level.to_string());
 
         // For buffer management for each stream
         let (buffer_tx, mut buffer_rx) = mpsc::channel::<BufferCommand>(1024);
@@ -337,15 +341,31 @@ async fn handle_stream(
     Ok::<()>(())
 }
 
-// TODO: LogLevelを設定できるようにする
-fn init_logging() {
+fn init_logging(log_level: String) {
+    let level_filter: LevelFilter = match log_level.to_uppercase().as_str() {
+        "OFF" => LevelFilter::OFF,
+        "TRACE" => LevelFilter::TRACE,
+        "DEBUG" => LevelFilter::DEBUG,
+        "INFO" => LevelFilter::INFO,
+        "WARN" => LevelFilter::WARN,
+        "ERROR" => LevelFilter::ERROR,
+        _ => {
+            panic!(
+                "Invalid log level: '{}'.\n  Valid log levels: [OFF, TRACE, DEBUG, INFO, WARN, ERROR]",
+                log_level
+            );
+        }
+    };
+
     let env_filter = EnvFilter::builder()
-        .with_default_directive(LevelFilter::DEBUG.into())
+        .with_default_directive(level_filter.into())
         .from_env_lossy();
 
     tracing_subscriber::fmt()
         .with_target(true)
         .with_level(true)
         .with_env_filter(env_filter)
         .init();
+
+    tracing::info!("Logging initialized. (Level: {})", log_level);
 }