Merge pull request #77 from datachainlab/log-level

Add cli option `log_level`

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

app/src/commands.rs

@@ -27,6 +27,7 @@ pub enum CliCmd {
 
 impl CliCmd {
     pub fn run(self, opts: &Opts) -> Result<()> {
+        Self::setup_logger(opts)?;
         match self {
             CliCmd::Enclave(cmd) => {
                 Self::setup_read_only_env(opts);
@@ -47,6 +48,15 @@ impl CliCmd {
         }
     }
 
+    fn setup_logger(opts: &Opts) -> Result<()> {
+        if let Some(level_filter) = opts.get_log_level_filter()? {
+            env_logger::builder().filter_level(level_filter).init();
+        } else {
+            env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
+        }
+        Ok(())
+    }
+
     fn setup_env(opts: &Opts) {
         let store = HostStore::RocksDB(RocksDBStore::open(opts.get_state_store_path()));
         let env = Environment::new(opts.get_home(), Arc::new(RwLock::new(store)));

app/src/main.rs

@@ -8,8 +8,5 @@ mod enclave;
 mod opts;
 
 fn main() -> Result<()> {
-    env_logger::init_from_env(
-        env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
-    );
     Cli::parse().run()
 }

app/src/opts.rs

@@ -1,11 +1,19 @@
+use anyhow::{anyhow, Result};
 use clap::Parser;
-use std::path::PathBuf;
+use log::LevelFilter;
+use std::{path::PathBuf, str::FromStr};
 
 #[derive(Debug, Parser)]
 pub struct Opts {
     /// Path to the home directory
     #[clap(long = "home", help = "Path to LCP home directory")]
     pub home: Option<PathBuf>,
+    /// Verbosity level of the logger
+    /// priority for setting log level:
+    /// 1. command line option
+    /// 2. environment variable
+    #[clap(long = "log_level", help = "Verbosity level of the logger")]
+    pub log_level: Option<String>,
 }
 
 impl Opts {
@@ -24,4 +32,14 @@ impl Opts {
     pub fn get_state_store_path(&self) -> PathBuf {
         self.get_home().join("state")
     }
+
+    pub fn get_log_level_filter(&self) -> Result<Option<LevelFilter>> {
+        if let Some(log_level) = self.log_level.as_ref() {
+            Ok(Some(LevelFilter::from_str(log_level).map_err(|_| {
+                anyhow!("Log level '{}' is not supported. The following levels are available: [OFF, ERROR, WARN, INFO, DEBUG, TRACE]", log_level)
+            })?))
+        } else {
+            Ok(None)
+        }
+    }
 }

modules/store/src/rocksdb.rs

@@ -46,8 +46,8 @@ impl RocksDBStore {
 
     pub fn open_read_only<P: AsRef<Path>>(path: P) -> Self {
         if !path.as_ref().exists() {
-            info!("initialize a database: {:?}", path.as_ref());
-            let _store = Self::open(path.as_ref());
+            let store = Self::open(path.as_ref());
+            drop(store);
         }
         let db = DB::open_for_read_only(&Default::default(), path, false).unwrap();
         RocksDBStoreBuilder {