From 4bf654c9b5577be1660ab1b85d1c543bce6cb483 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Sun, 22 Aug 2021 21:25:49 +0300 Subject: [PATCH] Do not use env logger, call log instead directly (#11) * Do not use env logger, call log instead directly * update example --- Cargo.toml | 1 - fang_examples/simple_worker/Cargo.toml | 1 + fang_examples/simple_worker/src/main.rs | 2 ++ src/executor.rs | 1 + src/lib.rs | 3 --- src/worker_pool.rs | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e0a89d7..894edab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,5 +19,4 @@ chrono = "0.4" serde_json = "1.0" typetag = "0.1" log = "0.4.0" -env_logger = "0.9.0" serde = { version = "1.0", features = ["derive"] } diff --git a/fang_examples/simple_worker/Cargo.toml b/fang_examples/simple_worker/Cargo.toml index 3aa5eb1..c30f3f2 100644 --- a/fang_examples/simple_worker/Cargo.toml +++ b/fang_examples/simple_worker/Cargo.toml @@ -9,3 +9,4 @@ edition = "2018" fang = { path = "../../" } serde = { version = "1.0", features = ["derive"] } dotenv = "0.15.0" +env_logger = "0.9.0" diff --git a/fang_examples/simple_worker/src/main.rs b/fang_examples/simple_worker/src/main.rs index b4160f5..e2b68ba 100644 --- a/fang_examples/simple_worker/src/main.rs +++ b/fang_examples/simple_worker/src/main.rs @@ -8,6 +8,8 @@ use simple_worker::MyJob; fn main() { dotenv().ok(); + env_logger::init(); + let mut worker_params = WorkerParams::new(); worker_params.set_retention_mode(RetentionMode::KeepAll); diff --git a/src/executor.rs b/src/executor.rs index 7c57aad..2e6dd74 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -2,6 +2,7 @@ use crate::queue::Queue; use crate::queue::Task; use diesel::pg::PgConnection; use diesel::r2d2::{ConnectionManager, PooledConnection}; +use log::error; use std::thread; use std::time::Duration; diff --git a/src/lib.rs b/src/lib.rs index eb75f32..10414fd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,9 +3,6 @@ #[macro_use] extern crate diesel; -#[macro_use] -extern crate log; - pub mod executor; pub mod queue; pub mod scheduler; diff --git a/src/worker_pool.rs b/src/worker_pool.rs index 4623b4e..ef20219 100644 --- a/src/worker_pool.rs +++ b/src/worker_pool.rs @@ -4,6 +4,8 @@ use crate::executor::Executor; use crate::executor::RetentionMode; use crate::executor::SleepParams; use crate::queue::Queue; +use log::error; +use log::info; use std::thread; pub struct WorkerPool { @@ -77,8 +79,6 @@ impl WorkerPool { } pub fn start(&self) { - env_logger::init(); - for idx in 1..self.number_of_workers + 1 { let worker_type = self .worker_params