diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2022-01-11 13:23:37 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2022-01-11 13:23:37 +0100 |
| commit | 23253a25e6130bbf888624406d02e4fdfdfdf637 (patch) | |
| tree | 2c3b5ea0c88833aa784a5c6b232a9d692149c18c /mullvad-daemon/src | |
| parent | 44726eced78dcc82c6e16d5ec15fc25ac5229a5c (diff) | |
| parent | 63a9b07b9df699c718be2b1e8498f895aecb98cb (diff) | |
| download | mullvadvpn-23253a25e6130bbf888624406d02e4fdfdfdf637.tar.xz mullvadvpn-23253a25e6130bbf888624406d02e4fdfdfdf637.zip | |
Merge branch 'unify-logging-format'
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/exception_logging/unix.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/version_check.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/exception_logging/unix.rs b/mullvad-daemon/src/exception_logging/unix.rs index 47477d71c4..8d87be2da6 100644 --- a/mullvad-daemon/src/exception_logging/unix.rs +++ b/mullvad-daemon/src/exception_logging/unix.rs @@ -38,7 +38,7 @@ pub fn enable() { let ret = unsafe { libc::sigaltstack(&stack_t, std::ptr::null_mut()) }; if ret != 0 { log::error!( - "Failed to set alternative stack - {}", + "Failed to set alternative stack: {}", std::io::Error::last_os_error() ); SaFlags::empty() diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index dbf1b26025..1703344007 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -1811,7 +1811,7 @@ where } if let Err(e) = self.settings.reset().await { - log::error!("Failed to reset settings - {}", e); + log::error!("Failed to reset settings: {}", e); last_error = Err(Error::ClearSettingsError(e)); } diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 89b14f08aa..bda0a97da3 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -952,7 +952,7 @@ impl RelaySelector { let bundled_relays = match ParsedRelays::from_file(resource_path) { Ok(bundled_relays) => bundled_relays, Err(e) => { - log::error!("Failed to load bundled relays - {}", e); + log::error!("Failed to load bundled relays: {}", e); return cached_relays; } }; diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs index 92e50c9edb..fba2654d6c 100644 --- a/mullvad-daemon/src/version_check.rs +++ b/mullvad-daemon/src/version_check.rs @@ -423,7 +423,7 @@ impl VersionUpdater { self.update_version_info(new_version_info).await; }, Err(err) => { - log::error!("Failed to fetch version info - {}", err); + log::error!("Failed to fetch version info: {}", err); self.internal_done_tx = None; }, } |
