Fixed-size logs

This commit is contained in:
Aditya Kulkarni
2019-10-02 10:12:21 -07:00
parent ead216b6ae
commit d4dc6cc6bd
2 changed files with 47 additions and 12 deletions

View File

@@ -9,13 +9,12 @@ futures = "0.1"
bytes = "0.4" bytes = "0.4"
base58 = "0.1.0" base58 = "0.1.0"
log = "0.4" log = "0.4"
log4rs = { version = "0.8.3", default-features = false, features = ["file", "file_appender"]} log4rs = "0.8.3"
dirs = "2.0.2" dirs = "2.0.2"
http = "0.1" http = "0.1"
prost = "0.5" prost = "0.5"
tokio = "0.1" tokio = "0.1"
tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" } tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" }
hyper = "0.12"
tower-util = "0.1" tower-util = "0.1"
hex = "0.3" hex = "0.3"
protobuf = "2" protobuf = "2"

View File

@@ -8,15 +8,22 @@ mod prover;
mod commands; mod commands;
mod utils; mod utils;
use std::io::{Result, Error, ErrorKind};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use lightclient::{LightClient, LightClientConfig}; use lightclient::{LightClient, LightClientConfig};
use log::{info, LevelFilter}; use log::{info, LevelFilter};
use log4rs::append::file::FileAppender; use log4rs::append::rolling_file::RollingFileAppender;
use log4rs::encode::pattern::PatternEncoder; use log4rs::encode::pattern::PatternEncoder;
use log4rs::config::{Appender, Config, Root}; use log4rs::config::{Appender, Config, Root};
use log4rs::filter::threshold::ThresholdFilter;
use log4rs::append::rolling_file::policy::compound::{
CompoundPolicy,
trigger::size::SizeTrigger,
roll::fixed_window::FixedWindowRoller,
};
use rustyline::error::ReadlineError; use rustyline::error::ReadlineError;
use rustyline::Editor; use rustyline::Editor;
@@ -33,6 +40,37 @@ pub struct SaplingParams;
const ANCHOR_OFFSET: u32 = 4; const ANCHOR_OFFSET: u32 = 4;
/// Build the Logging config
fn get_log_config(config: &LightClientConfig) -> Result<Config> {
let window_size = 3; // log0, log1, log2
let fixed_window_roller =
FixedWindowRoller::builder().build("log{}",window_size).unwrap();
let size_limit = 5 * 1024; // 5KB as max log file size to roll
let size_trigger = SizeTrigger::new(size_limit);
let compound_policy = CompoundPolicy::new(Box::new(size_trigger),Box::new(fixed_window_roller));
Config::builder()
.appender(
Appender::builder()
.filter(Box::new(ThresholdFilter::new(LevelFilter::Info)))
.build(
"logfile",
Box::new(
RollingFileAppender::builder()
.encoder(Box::new(PatternEncoder::new("{d} {l}::{m}{n}")))
.build(config.get_log_path(), Box::new(compound_policy))?,
),
),
)
.build(
Root::builder()
.appender("logfile")
.build(LevelFilter::Debug),
)
.map_err(|e|Error::new(ErrorKind::Other, format!("{}", e)))
}
pub fn main() { pub fn main() {
// Get command line arguments // Get command line arguments
let matches = App::new("Zecwallet CLI") let matches = App::new("Zecwallet CLI")
@@ -81,15 +119,13 @@ pub fn main() {
}; };
// Configure logging first. // Configure logging first.
let logfile = FileAppender::builder() let log_config = match get_log_config(&config) {
.encoder(Box::new(PatternEncoder::new("{l} -{d(%Y-%m-%d %H:%M:%S)}- {m}\n"))) Ok(c) => c,
.build(config.get_log_path()).unwrap(); Err(e) => {
let log_config = Config::builder() eprintln!("Error:\n{}\nCouldn't configure logging, quitting!", e);
.appender(Appender::builder().build("logfile", Box::new(logfile))) return;
.build(Root::builder() }
.appender("logfile") };
.build(LevelFilter::Info)).unwrap();
log4rs::init_config(log_config).unwrap(); log4rs::init_config(log_config).unwrap();
// Startup // Startup