Просмотр исходного кода

script/research/crdt: use log_config from darkfi::util

ghassmo 4 лет назад
Родитель
Сommit
3e76241ddd
1 измененных файлов с 5 добавлено и 12 удалено
  1. 5 12
      script/research/crdt/src/main.rs

+ 5 - 12
script/research/crdt/src/main.rs

@@ -3,9 +3,9 @@ use std::{env, sync::Arc};
 extern crate clap;
 extern crate clap;
 use async_executor::Executor;
 use async_executor::Executor;
 use easy_parallel::Parallel;
 use easy_parallel::Parallel;
-use simplelog::{ColorChoice, Config, LevelFilter, TermLogger, TerminalMode};
+use simplelog::{ColorChoice, TermLogger, TerminalMode};
 
 
-use darkfi::{net, Result};
+use darkfi::{net, util::cli::log_config, Result};
 
 
 use crdt::Node;
 use crdt::Node;
 
 
@@ -64,18 +64,11 @@ fn main() -> Result<()> {
     let ex = Arc::new(Executor::new());
     let ex = Arc::new(Executor::new());
     let (signal, shutdown) = async_channel::unbounded::<()>();
     let (signal, shutdown) = async_channel::unbounded::<()>();
 
 
-    let ex2 = ex.clone();
-
-    TermLogger::init(
-        LevelFilter::Debug,
-        Config::default(),
-        TerminalMode::Mixed,
-        ColorChoice::Auto,
-    )?;
+    let (lvl, cfg) = log_config(1)?;
 
 
-    // let nthreads = num_cpus::get();
-    // debug!(target: "IRC DAEMON", "Run {} executor threads", nthreads);
+    TermLogger::init(lvl, cfg, TerminalMode::Mixed, ColorChoice::Auto)?;
 
 
+    let ex2 = ex.clone();
     let (_, result) = Parallel::new()
     let (_, result) = Parallel::new()
         .each(0..4, |_| smol::future::block_on(ex.run(shutdown.recv())))
         .each(0..4, |_| smol::future::block_on(ex.run(shutdown.recv())))
         // Run the main future on the current thread.
         // Run the main future on the current thread.