Deuxfleurs/garage
42
42
Fork 58
Code Issues 80 Pull requests 7 Releases 29 Wiki Activity

Add support to logging to syslog (based on patch by @jirutka) #784

Merged
lx merged 3 commits from syslog into main 2024-03-20 13:54:19 +00:00
Conversation 0 Commits 3 Files changed 8 +26 -19
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 84018be862 - Show all commits

45
src/garage/main.rs
View file

@ -175,32 +175,39 @@ fn init_logging(opt: &Opt) {
let env_filter = tracing_subscriber::filter::EnvFilter::from_default_env(); let env_filter = tracing_subscriber::filter::EnvFilter::from_default_env();
#[cfg(feature = "syslog")]
if std::env::var("GARAGE_LOG_TO_SYSLOG") if std::env::var("GARAGE_LOG_TO_SYSLOG")
.map(|x| x == "1" || x == "true") .map(|x| x == "1" || x == "true")
.unwrap_or(false) .unwrap_or(false)
{ {
use std::ffi::CStr; #[cfg(feature = "syslog")]
use syslog_tracing::{Facility, Options, Syslog}; {
use std::ffi::CStr;
use syslog_tracing::{Facility, Options, Syslog};
let syslog = Syslog::new( let syslog = Syslog::new(
CStr::from_bytes_with_nul(b"garage\0").unwrap(), CStr::from_bytes_with_nul(b"garage\0").unwrap(),
Options::LOG_PID | Options::LOG_PERROR, Options::LOG_PID | Options::LOG_PERROR,
Facility::Daemon, Facility::Daemon,
) )
.expect("Unable to init syslog"); .expect("Unable to init syslog");
tracing_subscriber::fmt() tracing_subscriber::fmt()
.with_writer(syslog) .with_writer(syslog)
.with_env_filter(env_filter) .with_env_filter(env_filter)
.with_ansi(false) // disable ANSI escape sequences (colours) .with_ansi(false) // disable ANSI escape sequences (colours)
.with_file(false) .with_file(false)
.with_level(false) .with_level(false)
.without_time() .without_time()
.compact() .compact()
.init(); .init();
return; return;
}
#[cfg(not(feature = "syslog"))]
{
eprintln!("Syslog support is not enabled in this build.");
std::process::exit(1);
}
} }
tracing_subscriber::fmt() tracing_subscriber::fmt()