Unified the log level configuration behavior (#386)

Use RUST_LOG env first, if empty, use the --log-level-setting parameter

Author: r4ntix

ballista/executor/src/main.rs

@@ -93,9 +93,10 @@ async fn main() -> Result<()> {
     let grpc_port = opt.bind_grpc_port;
     let log_dir = opt.log_dir;
     let print_thread_info = opt.print_thread_info;
-
     let scheduler_name = format!("executor_{}_{}", bind_host, port);
 
+    let rust_log = env::var(EnvFilter::DEFAULT_ENV);
+    let log_filter = EnvFilter::new(rust_log.unwrap_or(special_mod_log_level));
     // File layer
     if let Some(log_dir) = log_dir {
         let log_file = tracing_appender::rolling::daily(log_dir, &scheduler_name);
@@ -104,18 +105,16 @@ async fn main() -> Result<()> {
             .with_thread_names(print_thread_info)
             .with_thread_ids(print_thread_info)
             .with_writer(log_file)
-            .with_env_filter(special_mod_log_level)
+            .with_env_filter(log_filter)
             .init();
     } else {
-        //Console layer
-        let rust_log = env::var(EnvFilter::DEFAULT_ENV);
-        let std_filter = EnvFilter::new(rust_log.unwrap_or_else(|_| "INFO".to_string()));
+        // Console layer
         tracing_subscriber::fmt()
             .with_ansi(true)
             .with_thread_names(print_thread_info)
             .with_thread_ids(print_thread_info)
             .with_writer(io::stdout)
-            .with_env_filter(std_filter)
+            .with_env_filter(log_filter)
             .init();
     }
 

ballista/scheduler/src/main.rs

@@ -172,6 +172,8 @@ async fn main() -> Result<()> {
         format!("scheduler_{}_{}_{}", namespace, external_host, port);
     let scheduler_name = format!("{}:{}", external_host, port);
 
+    let rust_log = env::var(EnvFilter::DEFAULT_ENV);
+    let log_filter = EnvFilter::new(rust_log.unwrap_or(special_mod_log_level));
     // File layer
     if let Some(log_dir) = log_dir {
         let log_file = tracing_appender::rolling::daily(log_dir, &log_file_name_prefix);
@@ -180,18 +182,16 @@ async fn main() -> Result<()> {
             .with_thread_names(print_thread_info)
             .with_thread_ids(print_thread_info)
             .with_writer(log_file)
-            .with_env_filter(special_mod_log_level)
+            .with_env_filter(log_filter)
             .init();
     } else {
-        //Console layer
-        let rust_log = env::var(EnvFilter::DEFAULT_ENV);
-        let std_filter = EnvFilter::new(rust_log.unwrap_or_else(|_| "INFO".to_string()));
+        // Console layer
         tracing_subscriber::fmt()
             .with_ansi(true)
             .with_thread_names(print_thread_info)
             .with_thread_ids(print_thread_info)
             .with_writer(io::stdout)
-            .with_env_filter(std_filter)
+            .with_env_filter(log_filter)
             .init();
     }