summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2022-01-11 12:30:04 +0100
committerLinus Färnstrand <faern@faern.net>2022-01-11 12:30:30 +0100
commit63a9b07b9df699c718be2b1e8498f895aecb98cb (patch)
tree2c3b5ea0c88833aa784a5c6b232a9d692149c18c /talpid-core/src
parent319b9debd6935b430c47ff99816ad903bb62f0cd (diff)
downloadmullvadvpn-63a9b07b9df699c718be2b1e8498f895aecb98cb.tar.xz
mullvadvpn-63a9b07b9df699c718be2b1e8498f895aecb98cb.zip
Use ": " as delimiter instead of " - " between messages and value
Diffstat (limited to 'talpid-core/src')
-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
8 files changed, 14 insertions, 14 deletions
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(())