summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mullvad-cli/src/cmds/bridge.rs4
-rw-r--r--mullvad-cli/src/cmds/reset.rs2
-rw-r--r--mullvad-daemon/src/exception_logging/unix.rs2
-rw-r--r--mullvad-daemon/src/lib.rs2
-rw-r--r--mullvad-daemon/src/relays.rs2
-rw-r--r--mullvad-daemon/src/version_check.rs2
-rw-r--r--mullvad-rpc/src/relay_list.rs2
-rw-r--r--talpid-core/src/dns/linux/resolvconf.rs4
-rw-r--r--talpid-core/src/dns/windows/mod.rs4
-rw-r--r--talpid-core/src/ping_monitor/unix.rs4
-rw-r--r--talpid-core/src/routing/linux.rs4
-rw-r--r--talpid-core/src/routing/macos.rs4
-rw-r--r--talpid-core/src/tunnel/wireguard/wireguard_go.rs4
-rw-r--r--talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs2
-rw-r--r--talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs2
-rw-r--r--talpid-dbus/src/network_manager.rs8
-rw-r--r--talpid-dbus/src/systemd_resolved.rs4
17 files changed, 28 insertions, 28 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 87b11affdc..f2442ea857 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -202,7 +202,7 @@ impl Bridge {
let settings = rpc.get_settings(()).await?.into_inner();
let bridge_settings = BridgeSettings::try_from(settings.bridge_settings.unwrap()).unwrap();
println!(
- "Bridge state - {}",
+ "Bridge state: {}",
BridgeState::try_from(settings.bridge_state.unwrap()).unwrap()
);
match bridge_settings {
@@ -216,7 +216,7 @@ impl Bridge {
}
},
BridgeSettings::Normal(constraints) => {
- println!("Bridge constraints - {}", constraints)
+ println!("Bridge constraints: {}", constraints)
}
};
Ok(())
diff --git a/mullvad-cli/src/cmds/reset.rs b/mullvad-cli/src/cmds/reset.rs
index 1be34a0ab0..963f62e005 100644
--- a/mullvad-cli/src/cmds/reset.rs
+++ b/mullvad-cli/src/cmds/reset.rs
@@ -31,7 +31,7 @@ impl Reset {
loop {
let mut buf = String::new();
if let Err(e) = stdin().read_line(&mut buf) {
- eprintln!("Couldn't read from STDIN - {}", e);
+ eprintln!("Couldn't read from STDIN: {}", e);
return false;
}
match buf.trim() {
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;
},
}
diff --git a/mullvad-rpc/src/relay_list.rs b/mullvad-rpc/src/relay_list.rs
index 25b96d6b61..e24a873ebb 100644
--- a/mullvad-rpc/src/relay_list.rs
+++ b/mullvad-rpc/src/relay_list.rs
@@ -100,7 +100,7 @@ impl ServerRelayList {
country.cities.push(location_to_city(&location, city_code));
}
None => {
- log::error!("Bad location code - {}", code);
+ log::error!("Bad location code:{}", code);
continue;
}
}
diff --git a/talpid-core/src/dns/linux/resolvconf.rs b/talpid-core/src/dns/linux/resolvconf.rs
index 4f29fdc92e..a9585d4ba2 100644
--- a/talpid-core/src/dns/linux/resolvconf.rs
+++ b/talpid-core/src/dns/linux/resolvconf.rs
@@ -166,7 +166,7 @@ impl Resolvconf {
match fs::read_to_string("/etc/resolv.conf") {
Ok(contents) => contents.contains("Generated by resolvconf"),
Err(err) => {
- log::error!("Couldn't read /etc/resolv.conf - {}", err);
+ log::error!("Couldn't read /etc/resolv.conf: {}", err);
return false;
}
}
@@ -178,7 +178,7 @@ impl Resolvconf {
match fs::canonicalize("/etc/resolv.conf") {
Err(err) => {
if err.kind() != io::ErrorKind::NotFound {
- log::error!("Failed to canonicalize /etc/resolv.conf - {}", err);
+ log::error!("Failed to canonicalize /etc/resolv.conf: {}", err);
}
false
}
diff --git a/talpid-core/src/dns/windows/mod.rs b/talpid-core/src/dns/windows/mod.rs
index 5ee5e56049..402c6600b6 100644
--- a/talpid-core/src/dns/windows/mod.rs
+++ b/talpid-core/src/dns/windows/mod.rs
@@ -83,8 +83,8 @@ impl super::DnsMonitorT for DnsMonitor {
.map(|ip_cstr| ip_cstr.as_ptr())
.collect::<Vec<_>>();
- log::trace!("ipv4 ips - {:?} - {}", ipv4, ipv4.len());
- log::trace!("ipv6 ips - {:?} - {}", ipv6, ipv6.len());
+ log::trace!("ipv4 ips: {:?} ({})", ipv4, ipv4.len());
+ log::trace!("ipv6 ips: {:?} ({})", ipv6, ipv6.len());
let luid = luid_from_alias(interface).map_err(Error::InterfaceLuidError)?;
diff --git a/talpid-core/src/ping_monitor/unix.rs b/talpid-core/src/ping_monitor/unix.rs
index fca9614e60..b93678a22b 100644
--- a/talpid-core/src/ping_monitor/unix.rs
+++ b/talpid-core/src/ping_monitor/unix.rs
@@ -60,7 +60,7 @@ impl super::Pinger for Pinger {
.unwrap_or(false)
{
if let Err(err) = proc.kill() {
- log::error!("Failed to kill ping process - {}", err);
+ log::error!("Failed to kill ping process: {}", err);
}
}
}
@@ -71,7 +71,7 @@ impl Drop for Pinger {
fn drop(&mut self) {
for child in self.processes.iter_mut() {
if let Err(e) = child.kill() {
- log::error!("Failed to kill ping process - {}", e);
+ log::error!("Failed to kill ping process: {}", e);
}
}
}
diff --git a/talpid-core/src/routing/linux.rs b/talpid-core/src/routing/linux.rs
index e9f917abd1..1a6b3a2874 100644
--- a/talpid-core/src/routing/linux.rs
+++ b/talpid-core/src/routing/linux.rs
@@ -104,7 +104,7 @@ pub enum Error {
#[error(display = "Invalid network prefix")]
InvalidNetworkPrefix(#[error(source)] ipnetwork::IpNetworkError),
- #[error(display = "Unknown device index - {}", _0)]
+ #[error(display = "Unknown device index: {}", _0)]
UnknownDeviceIndex(u32),
#[error(display = "Failed to get a route for the given IP address")]
@@ -314,7 +314,7 @@ impl RouteManagerImpl {
async fn cleanup_routes(&mut self) {
for route in self.added_routes.drain().collect::<Vec<_>>().iter() {
if let Err(e) = self.delete_route_if_exists(&route).await {
- log::error!("Failed to remove route - {} - {}", route, e);
+ log::error!("Failed to remove route: {}: {}", route, e);
}
}
}
diff --git a/talpid-core/src/routing/macos.rs b/talpid-core/src/routing/macos.rs
index 62d9a6e7f8..072ba6acfd 100644
--- a/talpid-core/src/routing/macos.rs
+++ b/talpid-core/src/routing/macos.rs
@@ -174,7 +174,7 @@ impl RouteManagerImpl {
let output = cmd.output().await.map_err(Error::FailedToRunRoute)?;
let output = String::from_utf8(output.stdout).map_err(|e| {
- log::error!("Failed to parse utf-8 bytes from output of netstat - {}", e);
+ log::error!("Failed to parse utf-8 bytes from output of netstat: {}", e);
Error::BadOutputFromNetstat
})?;
Ok(Self::parse_route(&output))
@@ -260,7 +260,7 @@ impl RouteManagerImpl {
log::debug!("Failed to remove route during shutdown");
}
}
- Err(e) => log::error!("Failed to remove route during shutdown - {}", e),
+ Err(e) => log::error!("Failed to remove route during shutdown: {}", e),
};
}
}
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
index cf79b69510..8e98a7fbdb 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
@@ -191,7 +191,7 @@ impl WgGoTunnel {
ConvertInterfaceLuidToIndex(&iface_luid as *const _, &mut iface_idx as *mut _);
if status != 0 {
log::error!(
- "Failed to convert interface LUID to interface index - {} - {}",
+ "Failed to convert interface LUID to interface index: {}: {}",
status,
std::io::Error::last_os_error()
);
@@ -289,7 +289,7 @@ impl WgGoTunnel {
impl Drop for WgGoTunnel {
fn drop(&mut self) {
if let Err(e) = self.stop_tunnel() {
- log::error!("Failed to stop tunnel - {}", e);
+ log::error!("Failed to stop tunnel: {}", e);
}
}
}
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
index 460a628a26..0f3866500e 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs
@@ -281,7 +281,7 @@ impl WireguardConnection {
}
}
anything_else => {
- log::error!("Received unexpected response - {:?}", anything_else);
+ log::error!("Received unexpected response: {:?}", anything_else);
Err(Error::NoResponse)
}
},
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs
index ab640732bd..8ab3234fd5 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs
@@ -88,7 +88,7 @@ impl Tunnel for NetlinkTunnel {
} = *self;
tokio_handle.block_on(async move {
if let Err(err) = netlink_connections.delete_device(interface_index).await {
- log::error!("Failed to remove WireGuard device - {}", err);
+ log::error!("Failed to remove WireGuard device: {}", err);
Err(TunnelError::FatalStartWireguardError)
} else {
Ok(())
diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs
index 6ad68c364d..93ec73e3fe 100644
--- a/talpid-dbus/src/network_manager.rs
+++ b/talpid-dbus/src/network_manager.rs
@@ -77,13 +77,13 @@ pub enum Error {
#[error(display = "Configuration has no device associated to it")]
NoDevice,
- #[error(display = "NetworkManager is too old - {}.{}", _0, _1)]
+ #[error(display = "NetworkManager is too old: {}.{}", _0, _1)]
NMTooOld(u32, u32),
- #[error(display = "NetworkManager is too new to manage DNS - {}.{}", _0, _1)]
+ #[error(display = "NetworkManager is too new to manage DNS: {}.{}", _0, _1)]
NMTooNewFroDns(u32, u32),
- #[error(display = "Failed to parse NetworkManager version string - {}", _0)]
+ #[error(display = "Failed to parse NetworkManager version string: {}", _0)]
ParseNmVersionError(String),
#[error(display = "Device inactive: {}", _0)]
@@ -162,7 +162,7 @@ impl NetworkManager {
}
Err(err) => {
log::error!(
- "Failed to create a new interface via AddConnection2 - {}",
+ "Failed to create a new interface via AddConnection2: {}",
err
);
return Err(err);
diff --git a/talpid-dbus/src/systemd_resolved.rs b/talpid-dbus/src/systemd_resolved.rs
index 7d0e915371..b68c3a08d9 100644
--- a/talpid-dbus/src/systemd_resolved.rs
+++ b/talpid-dbus/src/systemd_resolved.rs
@@ -156,7 +156,7 @@ impl SystemdResolved {
Self::ensure_resolvconf_contents()
}
Err(err) => {
- log::trace!("Failed to read /etc/resolv.conf symlink - {}", err);
+ log::trace!("Failed to read /etc/resolv.conf symlink: {}", err);
Err(Error::NotSymlinkedToResolvConf)
}
}
@@ -183,7 +183,7 @@ impl SystemdResolved {
Ok(link_destination) => RESOLVED_STUB_PATHS.contains(&link_destination.as_ref()),
Err(e) => {
log::error!(
- "Failed to canonicalize resolv conf path {} - {}",
+ "Failed to canonicalize resolv conf path {}: {}",
link_path.display(),
e
);
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.