5cb8025ddd
* cleanup legacy "3 dot" check (#2625)
* Allow to peers behind NAT to get up to preferred_max connections (#2543)
Allow to peers behind NAT to get up to preffered_max connections
If peer has only outbound connections it's mot likely behind NAT and we should not stop it from getting more outbound connections
* Reduce usage of unwrap in p2p crate (#2627)
Also change store crate a bit
* Simplify (and fix) output_pos cleanup during chain compaction (#2609)
* expose leaf pos iterator
use it for various things in txhashset when iterating over outputs
* fix
* cleanup
* rebuild output_pos index (and clear it out first) when compacting the chain
* fixup tests
* refactor to match on (output, proof) tuple
* add comments to compact() to explain what is going on.
* get rid of some boxing around the leaf_set iterator
* cleanup
* [docs] Add switch commitment documentation (#2526)
* remove references to no-longer existing switch commitment hash
(as switch commitments were removed in ca8447f3bd
and moved into the blinding factor of the Pedersen Commitment)
* some rewording (points vs curves) and fix of small formatting issues
* Add switch commitment documentation
* [docs] Documents in grin repo had translated in Korean. (#2604)
* Start to M/W intro translate in Korean
* translate in Korean
* add korean translation on intro
* table_of_content.md translate in Korean.
* table_of_content_KR.md finish translate in Korean, start to translate State_KR.md
* add state_KR.md & commit some translation in State_KR.md
* WIP stat_KR.md translation
* add build_KR.md && stratum_KR.md
* finish translate stratum_KR.md & table_of_content_KR.md
* rename intro.KR.md to intro_KR.md
* add intro_KR.md file path each language's intro.md
* add Korean translation file path to stratum.md & table_of_contents.md
* fix difference with grin/master
* Fix TxHashSet file filter for Windows. (#2641)
* Fix TxHashSet file filter for Windows.
* rustfmt
* Updating regexp
* Adding in test case
* Display the current download rate rather than the average when syncing the chain (#2633)
* When syncing the chain, calculate the displayed download speed using the current rate from the most recent iteration, rather than the average download speed from the entire syncing process.
* Replace the explicitly ignored variables in the pattern with an implicit ignore
* remove root = true from editorconfig (#2655)
* Add Medium post to intro (#2654)
Spoke to @yeastplume who agreed it makes sense to add the "Grin Transactions Explained, Step-by-Step" Medium post to intro.md
Open for suggestions on a better location.
* add a new configure item for log_max_files (#2601)
* add a new configure item for log_max_files
* rustfmt
* use a constant instead of multiple 32
* rustfmt
* Fix the build warning of deprecated trim_right_matches (#2662)
* [DOC] state.md, build.md and chain directory documents translate in Korean. (#2649)
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* remove some useless md files for translation. this is rearrange set up translation order.
* add dot end of sentence & translate build.md in korean
* remove fast-sync_KR.md
* finish build_KR.md translation
* finish build_KR.md translation
* finish translation state_KR.md & add phrase in state.md to move other language md file
* translate blocks_and_headers.md && chain_sync.md in Korean
* add . in chain_sync.md , translation finished in doc/chain dir.
* fix some miss typos
* Api documentation fixes (#2646)
* Fix the API documentation for Chain Validate (v1/chain/validate). It was documented as a POST, but it is actually a GET request, which can be seen in its handler ChainValidationHandler
* Update the API V1 route list response to include the headers and merkleproof routes. Also clarify that for the chain/outputs route you must specify either byids or byheight to select outputs.
* refactor(ci): reorganize CI related code (#2658)
Break-down the CI related code into smaller more maintainable pieces.
* Specify grin or nanogrins in API docs where applicable (#2642)
* Set Content-Type in API client (#2680)
* Reduce number of unwraps in chain crate (#2679)
* fix: the restart of state sync doesn't work sometimes (#2687)
* let check_txhashset_needed return true on abnormal case (#2684)
* Reduce number of unwwaps in api crate (#2681)
* Reduce number of unwwaps in api crate
* Format use section
* Small QoL improvements for wallet developers (#2651)
* Small changes for wallet devs
* Move create_nonce into Keychain trait
* Replace match by map_err
* Add flag to Slate to skip fee check
* Fix secp dependency
* Remove check_fee flag in Slate
* Add Japanese edition of build.md (#2697)
* catch the panic to avoid peer thread quit early (#2686)
* catch the panic to avoid peer thread quit before taking the chance to ban
* move catch wrapper logic down into the util crate
* log the panic info
* keep txhashset.rs untouched
* remove a warning
* [DOC] dandelion.md, simulation.md ,fast-sync.md and pruning.md documents translate in Korean. (#2678)
* Show response code in API client error message (#2683)
It's hard to investigate what happens when an API client error is
printed out
* Add some better logging for get_outputs_by_id failure states (#2705)
* Switch commitment doc fixes (#2645)
Fix some typos and remove the use of parentheses in a
couple of places to make the reading flow a bit better.
* docs: update/add new README.md badges (#2708)
Replace existing badges with SVG counterparts and add a bunch of new ones.
* Update intro.md (#2702)
Add mention of censoring attack prevented by range proofs
* use sandbox folder for txhashset validation on state sync (#2685)
* use sandbox folder for txhashset validation on state sync
* rustfmt
* use temp directory as the sandbox instead actual db_root txhashset dir
* rustfmt
* move txhashset overwrite to the end of full validation
* fix travis-ci test
* rustfmt
* fix: hashset have 2 folders including txhashset and header
* rustfmt
*
(1)switch to rebuild_header_mmr instead of copy the sandbox header mmr
(2)lock txhashset when overwriting and opening and rebuild
* minor improve on sandbox_dir
* add Japanese edition of state.md (#2703)
* Attempt to fix broken TUI locale (#2713)
Can confirm that on the same machine 1.0.2 TUI looks great and is broken on
the current master. Bump of `cursive` version fixed it for me.
Fixes #2676
* clean the header folder in sandbox (#2716)
* forgot to clean the header folder in sandbox in #2685
* Reduce number of unwraps in servers crate (#2707)
It doesn't include stratum server which is sufficiently changed in 1.1
branch and adapters, which is big enough for a separate PR.
* rustfmt
* change version to beta
278 lines
7.6 KiB
Rust
278 lines
7.6 KiB
Rust
// Copyright 2018 The Grin Developers
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Logging wrapper to be used throughout all crates in the workspace
|
|
use crate::Mutex;
|
|
use std::ops::Deref;
|
|
|
|
use backtrace::Backtrace;
|
|
use std::{panic, thread};
|
|
|
|
use crate::types::{self, LogLevel, LoggingConfig};
|
|
|
|
use log::{LevelFilter, Record};
|
|
use log4rs;
|
|
use log4rs::append::console::ConsoleAppender;
|
|
use log4rs::append::file::FileAppender;
|
|
use log4rs::append::rolling_file::{
|
|
policy::compound::roll::fixed_window::FixedWindowRoller,
|
|
policy::compound::trigger::size::SizeTrigger, policy::compound::CompoundPolicy,
|
|
RollingFileAppender,
|
|
};
|
|
use log4rs::append::Append;
|
|
use log4rs::config::{Appender, Config, Root};
|
|
use log4rs::encode::pattern::PatternEncoder;
|
|
use log4rs::filter::{threshold::ThresholdFilter, Filter, Response};
|
|
|
|
fn convert_log_level(in_level: &LogLevel) -> LevelFilter {
|
|
match *in_level {
|
|
LogLevel::Info => LevelFilter::Info,
|
|
LogLevel::Warning => LevelFilter::Warn,
|
|
LogLevel::Debug => LevelFilter::Debug,
|
|
LogLevel::Trace => LevelFilter::Trace,
|
|
LogLevel::Error => LevelFilter::Error,
|
|
}
|
|
}
|
|
|
|
lazy_static! {
|
|
/// Flag to observe whether logging was explicitly initialised (don't output otherwise)
|
|
static ref WAS_INIT: Mutex<bool> = Mutex::new(false);
|
|
/// Flag to observe whether tui is running, and we therefore don't want to attempt to write
|
|
/// panics to stdout
|
|
static ref TUI_RUNNING: Mutex<bool> = Mutex::new(false);
|
|
/// Static Logging configuration, should only be set once, before first logging call
|
|
static ref LOGGING_CONFIG: Mutex<LoggingConfig> = Mutex::new(LoggingConfig::default());
|
|
}
|
|
|
|
const LOGGING_PATTERN: &str = "{d(%Y%m%d %H:%M:%S%.3f)} {h({l})} {M} - {m}{n}";
|
|
|
|
/// This filter is rejecting messages that doesn't start with "grin"
|
|
/// in order to save log space for only Grin-related records
|
|
#[derive(Debug)]
|
|
struct GrinFilter;
|
|
|
|
impl Filter for GrinFilter {
|
|
fn filter(&self, record: &Record<'_>) -> Response {
|
|
if let Some(module_path) = record.module_path() {
|
|
if module_path.starts_with("grin") {
|
|
return Response::Neutral;
|
|
}
|
|
}
|
|
|
|
Response::Reject
|
|
}
|
|
}
|
|
|
|
/// Initialize the logger with the given configuration
|
|
pub fn init_logger(config: Option<LoggingConfig>) {
|
|
if let Some(c) = config {
|
|
let tui_running = c.tui_running.unwrap_or(false);
|
|
if tui_running {
|
|
let mut tui_running_ref = TUI_RUNNING.lock();
|
|
*tui_running_ref = true;
|
|
}
|
|
|
|
// Save current logging configuration
|
|
let mut config_ref = LOGGING_CONFIG.lock();
|
|
*config_ref = c.clone();
|
|
|
|
let level_stdout = convert_log_level(&c.stdout_log_level);
|
|
let level_file = convert_log_level(&c.file_log_level);
|
|
let level_minimum;
|
|
|
|
// Determine minimum logging level for Root logger
|
|
if level_stdout > level_file {
|
|
level_minimum = level_stdout;
|
|
} else {
|
|
level_minimum = level_file;
|
|
}
|
|
|
|
// Start logger
|
|
let stdout = ConsoleAppender::builder()
|
|
.encoder(Box::new(PatternEncoder::new(&LOGGING_PATTERN)))
|
|
.build();
|
|
|
|
let mut root = Root::builder();
|
|
|
|
let mut appenders = vec![];
|
|
|
|
if c.log_to_stdout && !tui_running {
|
|
let filter = Box::new(ThresholdFilter::new(level_stdout));
|
|
appenders.push(
|
|
Appender::builder()
|
|
.filter(filter)
|
|
.filter(Box::new(GrinFilter))
|
|
.build("stdout", Box::new(stdout)),
|
|
);
|
|
|
|
root = root.appender("stdout");
|
|
}
|
|
|
|
if c.log_to_file {
|
|
// If maximum log size is specified, use rolling file appender
|
|
// or use basic one otherwise
|
|
let filter = Box::new(ThresholdFilter::new(level_file));
|
|
let file: Box<dyn Append> = {
|
|
if let Some(size) = c.log_max_size {
|
|
let count = c
|
|
.log_max_files
|
|
.unwrap_or_else(|| types::DEFAULT_ROTATE_LOG_FILES);
|
|
let roller = FixedWindowRoller::builder()
|
|
.build(&format!("{}.{{}}.gz", c.log_file_path), count)
|
|
.unwrap();
|
|
let trigger = SizeTrigger::new(size);
|
|
|
|
let policy = CompoundPolicy::new(Box::new(trigger), Box::new(roller));
|
|
|
|
Box::new(
|
|
RollingFileAppender::builder()
|
|
.append(c.log_file_append)
|
|
.encoder(Box::new(PatternEncoder::new(&LOGGING_PATTERN)))
|
|
.build(c.log_file_path, Box::new(policy))
|
|
.expect("Failed to create logfile"),
|
|
)
|
|
} else {
|
|
Box::new(
|
|
FileAppender::builder()
|
|
.append(c.log_file_append)
|
|
.encoder(Box::new(PatternEncoder::new(&LOGGING_PATTERN)))
|
|
.build(c.log_file_path)
|
|
.expect("Failed to create logfile"),
|
|
)
|
|
}
|
|
};
|
|
|
|
appenders.push(
|
|
Appender::builder()
|
|
.filter(filter)
|
|
.filter(Box::new(GrinFilter))
|
|
.build("file", file),
|
|
);
|
|
root = root.appender("file");
|
|
}
|
|
|
|
let config = Config::builder()
|
|
.appenders(appenders)
|
|
.build(root.build(level_minimum))
|
|
.unwrap();
|
|
|
|
let _ = log4rs::init_config(config).unwrap();
|
|
|
|
info!(
|
|
"log4rs is initialized, file level: {:?}, stdout level: {:?}, min. level: {:?}",
|
|
level_file, level_stdout, level_minimum
|
|
);
|
|
|
|
// Mark logger as initialized
|
|
let mut was_init_ref = WAS_INIT.lock();
|
|
*was_init_ref = true;
|
|
}
|
|
|
|
send_panic_to_log();
|
|
}
|
|
|
|
/// Initializes the logger for unit and integration tests
|
|
pub fn init_test_logger() {
|
|
let mut was_init_ref = WAS_INIT.lock();
|
|
if *was_init_ref.deref() {
|
|
return;
|
|
}
|
|
let mut logger = LoggingConfig::default();
|
|
logger.log_to_file = false;
|
|
logger.stdout_log_level = LogLevel::Debug;
|
|
|
|
// Save current logging configuration
|
|
let mut config_ref = LOGGING_CONFIG.lock();
|
|
*config_ref = logger;
|
|
|
|
let level_stdout = convert_log_level(&config_ref.stdout_log_level);
|
|
let level_minimum = level_stdout; // minimum logging level for Root logger
|
|
|
|
// Start logger
|
|
let stdout = ConsoleAppender::builder()
|
|
.encoder(Box::new(PatternEncoder::default()))
|
|
.build();
|
|
|
|
let mut root = Root::builder();
|
|
|
|
let mut appenders = vec![];
|
|
|
|
{
|
|
let filter = Box::new(ThresholdFilter::new(level_stdout));
|
|
appenders.push(
|
|
Appender::builder()
|
|
.filter(filter)
|
|
.filter(Box::new(GrinFilter))
|
|
.build("stdout", Box::new(stdout)),
|
|
);
|
|
|
|
root = root.appender("stdout");
|
|
}
|
|
|
|
let config = Config::builder()
|
|
.appenders(appenders)
|
|
.build(root.build(level_minimum))
|
|
.unwrap();
|
|
|
|
let _ = log4rs::init_config(config).unwrap();
|
|
|
|
info!(
|
|
"log4rs is initialized, stdout level: {:?}, min. level: {:?}",
|
|
level_stdout, level_minimum
|
|
);
|
|
|
|
*was_init_ref = true;
|
|
}
|
|
|
|
/// hook to send panics to logs as well as stderr
|
|
fn send_panic_to_log() {
|
|
panic::set_hook(Box::new(|info| {
|
|
let backtrace = Backtrace::new();
|
|
|
|
let thread = thread::current();
|
|
let thread = thread.name().unwrap_or("unnamed");
|
|
|
|
let msg = match info.payload().downcast_ref::<&'static str>() {
|
|
Some(s) => *s,
|
|
None => match info.payload().downcast_ref::<String>() {
|
|
Some(s) => &**s,
|
|
None => "Box<Any>",
|
|
},
|
|
};
|
|
|
|
match info.location() {
|
|
Some(location) => {
|
|
error!(
|
|
"\nthread '{}' panicked at '{}': {}:{}{:?}\n\n",
|
|
thread,
|
|
msg,
|
|
location.file(),
|
|
location.line(),
|
|
backtrace
|
|
);
|
|
}
|
|
None => error!("thread '{}' panicked at '{}'{:?}", thread, msg, backtrace),
|
|
}
|
|
//also print to stderr
|
|
let tui_running = TUI_RUNNING.lock().clone();
|
|
if !tui_running {
|
|
let config = LOGGING_CONFIG.lock();
|
|
|
|
eprintln!(
|
|
"Thread '{}' panicked with message:\n\"{}\"\nSee {} for further details.",
|
|
thread, msg, config.log_file_path
|
|
);
|
|
}
|
|
}));
|
|
}
|