better log configuration

Signed-off-by: Rachel Powers <[email protected]>

Author: Ryex

mcmeta/Cargo.toml

@@ -21,4 +21,4 @@ serde_valid = "0.15.0"
 tokio = { version = "1.27.0", features = ["full"] }
 tracing = "0.1.37"
 tracing-appender = "0.2.2"
-tracing-subscriber = { version = "0.3.16" }
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

mcmeta/src/app_config.rs

@@ -14,11 +14,33 @@ pub struct MetadataConfig {
     pub max_parallel_fetch_connections: usize,
 }
 
+#[derive(Deserialize, Debug)]
+pub struct DebugLogConfig {
+    pub enable: bool,
+    pub path: String,
+    pub prefix: String,
+    pub level: String,
+}
+
+impl DebugLogConfig {
+    pub fn tracing_level(&self) -> tracing::Level {
+        match self.level.to_uppercase().trim() {
+            "TRACE" => tracing::Level::TRACE,
+            "DEBUG" => tracing::Level::DEBUG,
+            "INFO" => tracing::Level::INFO,
+            "WARN" => tracing::Level::WARN,
+            "ERROR" => tracing::Level::ERROR,
+            _ => tracing::Level::ERROR,
+        }
+    }
+}
+
 #[derive(Deserialize, Debug)]
 pub struct ServerConfig {
     pub bind_address: String,
     pub storage_format: StorageFormat,
     pub metadata: MetadataConfig,
+    pub debug_log: DebugLogConfig,
 }
 
 impl ServerConfig {
@@ -28,6 +50,10 @@ impl ServerConfig {
             .set_default("storage_format.type", "json")?
             .set_default("storage_format.meta_directory", "meta")?
             .set_default("metadata.max_parallel_fetch_connections", 4)?
+            .set_default("debug_log.enable", false)?
+            .set_default("debug_log.path", "./logs")?
+            .set_default("debug_log.prefix", "mcmeta.log")?
+            .set_default("debug_log.level", "debug")?
             .add_source(config::File::new(
                 "config/settings",
                 config::FileFormat::Json,

mcmeta/src/main.rs

@@ -254,7 +254,9 @@ use tracing_subscriber::{filter, prelude::*};
 
 #[tokio::main]
 async fn main() -> Result<(), MetaMCError> {
-    let file_appender = tracing_appender::rolling::hourly("logs", "mcmeta.log");
+    let config = Arc::new(ServerConfig::from_config()?);
+
+    let file_appender = tracing_appender::rolling::hourly(&config.debug_log.path, &config.debug_log.prefix);
     let (non_blocking_file, _guard) = tracing_appender::non_blocking(file_appender);
     let stdout_log = tracing_subscriber::fmt::layer()
         .with_file(true)
@@ -263,18 +265,21 @@ async fn main() -> Result<(), MetaMCError> {
         .compact();
 
     let debug_log = tracing_subscriber::fmt::layer()
+        .with_ansi(false)
         .with_writer(non_blocking_file)
-        .with_filter(filter::LevelFilter::DEBUG);
+        .with_filter(filter::LevelFilter::from_level(config.debug_log.tracing_level()));
 
-    tracing_subscriber::registry()
-        .with(
-            stdout_log
-                // .with_filter(filter::LevelFilter::INFO)
-                .and_then(debug_log),
-        )
-        .init();
+    if config.debug_log.enable {
+        tracing_subscriber::registry()
+            .with(stdout_log.with_filter(filter::EnvFilter::from_default_env()))
+            .with(debug_log)
+            .init();
+    } else {
+        tracing_subscriber::registry()
+            .with(stdout_log.with_filter(filter::EnvFilter::from_default_env()))
+            .init();
+    }
 
-    let config = Arc::new(ServerConfig::from_config()?);
     debug!("Config: {:#?}", config);
 
     config