splitting part of util into smaller crates (#4956)
* split path module from util * moved RotatingLogger from util to logger crate * fix tests * fix tests * use only one version of ansi_term crate
This commit is contained in:
@@ -24,6 +24,7 @@ semver = "0.5"
|
||||
ethcore-ipc-nano = { path = "../ipc/nano" }
|
||||
futures = "0.1"
|
||||
tokio-core = "0.1"
|
||||
ethcore-logger = { path = "../logger" }
|
||||
|
||||
[profile.release]
|
||||
debug = true
|
||||
|
||||
@@ -24,6 +24,7 @@ extern crate ethcore_util as util;
|
||||
extern crate ethcore_ipc as ipc;
|
||||
extern crate semver;
|
||||
extern crate futures;
|
||||
extern crate ethcore_logger;
|
||||
|
||||
#[cfg(test)] extern crate tokio_core;
|
||||
extern crate ethcore_devtools as devtools;
|
||||
@@ -323,6 +324,8 @@ mod tests {
|
||||
use tokio_core::io;
|
||||
use futures::{Future, future};
|
||||
|
||||
use ethcore_logger::init_log;
|
||||
|
||||
pub struct VoidManager;
|
||||
|
||||
impl JobDispatcher for VoidManager {
|
||||
@@ -331,32 +334,6 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
static ref LOG_DUMMY: bool = {
|
||||
use log::LogLevelFilter;
|
||||
use env_logger::LogBuilder;
|
||||
use std::env;
|
||||
|
||||
let mut builder = LogBuilder::new();
|
||||
builder.filter(None, LogLevelFilter::Info);
|
||||
|
||||
if let Ok(log) = env::var("RUST_LOG") {
|
||||
builder.parse(&log);
|
||||
}
|
||||
|
||||
if let Ok(_) = builder.init() {
|
||||
println!("logger initialized");
|
||||
}
|
||||
true
|
||||
};
|
||||
}
|
||||
|
||||
/// Intialize log with default settings
|
||||
#[cfg(test)]
|
||||
fn init_log() {
|
||||
let _ = *LOG_DUMMY;
|
||||
}
|
||||
|
||||
fn dummy_request(addr: &SocketAddr, data: &str) -> Vec<u8> {
|
||||
let mut core = Core::new().expect("Tokio Core should be created with no errors");
|
||||
let mut buffer = vec![0u8; 2048];
|
||||
|
||||
Reference in New Issue
Block a user