vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logging in docker.

Browse source 
Docker by default doesn't have a TTY. The TermLogger doesn't work in that case.
If the TermLogger can't be initiated, try the SimpleLogger.
See https://github.com/Drakulix/simplelog.rs/issues/30 for a similar case.
This commit is contained in:
Tim Peters 2019-05-27 21:02:30 +02:00
parent f3e48b8507
commit 0224a5dee3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -124,8 +124,10 @@ fn daemonize(options: &getopts::Matches) -> Result<()> {
#[cfg(unix)] #[cfg(unix)]
fn init_log(log_level: LevelFilter, options: &getopts::Matches) -> Result<()> { fn init_log(log_level: LevelFilter, options: &getopts::Matches) -> Result<()> {
if options.opt_present("f") { if options.opt_present("f") {
if let Err(e) = TermLogger::init(log_level, LOG_CONFIG) { if let Err(_) = TermLogger::init(log_level, LOG_CONFIG) {
bail!("Error starting terminal logger: {}", e); if let Err(e) = SimpleLogger::init(log_level, LOG_CONFIG) {
bail!("Error starting terminal logger: {}", e);
};
}; };
} else { } else {
if let Err(e) = SimpleLogger::init(log_level, LOG_CONFIG) { if let Err(e) = SimpleLogger::init(log_level, LOG_CONFIG) {