summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-04-08 16:26:28 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-04-08 17:03:43 +0200
commit96ad11e7fa6f7f4d5bb7e24f1e70fe68d8f3c0e9 (patch)
tree2943d6e59e3128f714b275494cc23776b5311a21
parent556b6dfe0c6770a3208b7de4a5070f83c77660da (diff)
downloadmullvadvpn-96ad11e7fa6f7f4d5bb7e24f1e70fe68d8f3c0e9.tar.xz
mullvadvpn-96ad11e7fa6f7f4d5bb7e24f1e70fe68d8f3c0e9.zip
Call ErrorExt::display_chain in simpler way
-rw-r--r--mullvad-daemon/src/lib.rs23
1 files changed, 10 insertions, 13 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 021ee2262a..c76da2fe8d 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -388,7 +388,7 @@ impl Daemon {
})
});
if let Err(e) = result {
- error!("{}", ErrorExt::display_chain(&e));
+ error!("{}", e.display_chain());
}
}
@@ -550,10 +550,7 @@ impl Daemon {
let https_handle = self.https_handle.clone();
geoip::send_location_request(https_handle).map_err(|e| {
- warn!(
- "Unable to fetch GeoIP location: {}",
- ErrorExt::display_chain(&e)
- );
+ warn!("Unable to fetch GeoIP location: {}", e.display_chain());
})
}
@@ -618,7 +615,7 @@ impl Daemon {
}
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -675,7 +672,7 @@ impl Daemon {
self.reconnect_tunnel();
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -690,7 +687,7 @@ impl Daemon {
self.send_tunnel_command(TunnelCommand::AllowLan(allow_lan));
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -713,7 +710,7 @@ impl Daemon {
));
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -727,7 +724,7 @@ impl Daemon {
.notify_settings(self.settings.clone());
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -743,7 +740,7 @@ impl Daemon {
self.reconnect_tunnel();
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -810,7 +807,7 @@ impl Daemon {
self.reconnect_tunnel();
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}
@@ -826,7 +823,7 @@ impl Daemon {
self.reconnect_tunnel();
}
}
- Err(e) => error!("{}", ErrorExt::display_chain(&e)),
+ Err(e) => error!("{}", e.display_chain()),
}
}