diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-04-30 21:26:21 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-05-07 08:30:45 -0300 |
| commit | 16a7ebc3f572f7c2aeb4fe1cc207815bd58edee2 (patch) | |
| tree | d467fac7e2ad76698f207775bbaa6d4c3e4a18f0 | |
| parent | 4f7126cbbeab07ece3eb3c0b430065ab4ac6aeba (diff) | |
| download | mullvadvpn-16a7ebc3f572f7c2aeb4fe1cc207815bd58edee2.tar.xz mullvadvpn-16a7ebc3f572f7c2aeb4fe1cc207815bd58edee2.zip | |
Use platform specific newlines in daemon log file
| -rw-r--r-- | mullvad-daemon/src/logging.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mullvad-daemon/src/logging.rs b/mullvad-daemon/src/logging.rs index caac15d02a..2168597494 100644 --- a/mullvad-daemon/src/logging.rs +++ b/mullvad-daemon/src/logging.rs @@ -1,6 +1,7 @@ extern crate fern; use self::fern::colors::{Color, ColoredLevelConfig}; +use self::fern::Output; use chrono; use log; @@ -40,6 +41,12 @@ const COLORS: ColoredLevelConfig = ColoredLevelConfig { trace: Color::Black, }; +#[cfg(not(windows))] +const LINE_SEPARATOR: &str = "\n"; + +#[cfg(windows)] +const LINE_SEPARATOR: &str = "\r\n"; + pub const DATE_TIME_FORMAT_STR: &str = "[%Y-%m-%d %H:%M:%S%.3f]"; pub fn init_logger( @@ -70,7 +77,7 @@ pub fn init_logger( .chain_err(|| ErrorKind::WriteFileError(log_file.to_path_buf()))?; let file_dispatcher = fern::Dispatch::new() .format(move |out, message, record| file_formatter.output_msg(out, message, record)) - .chain(f); + .chain(Output::file(f, LINE_SEPARATOR)); top_dispatcher = top_dispatcher.chain(file_dispatcher); } top_dispatcher.apply()?; |