summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-04-12 10:02:16 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-04-12 12:07:56 +0200
commitcf3b0755b4fc526770b7f7c80bf5a0df85565774 (patch)
tree9cb18883695bc01b1159bcf0638c50899e14b4a7
parentd3fb7fbcbbb774b6b7ff7f72fc1c5322229c9b70 (diff)
downloadmullvadvpn-cf3b0755b4fc526770b7f7c80bf5a0df85565774.tar.xz
mullvadvpn-cf3b0755b4fc526770b7f7c80bf5a0df85565774.zip
Fix windows error mapping
-rw-r--r--mullvad-daemon/src/system_service.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs
index 4e0b77cc53..61bbb84981 100644
--- a/mullvad-daemon/src/system_service.rs
+++ b/mullvad-daemon/src/system_service.rs
@@ -40,7 +40,7 @@ pub fn handle_service_main(_arguments: Vec<OsString>) {
log::info!("Service started.");
match run_service() {
Ok(()) => log::info!("Service stopped."),
- Err(error) => log::error!("{}", error.display_chain()),
+ Err(error) => log::error!("{}", error),
};
}
@@ -78,7 +78,7 @@ fn run_service() -> Result<(), String> {
persistent_service_status.set_running().unwrap();
- Ok(daemon.run()?)
+ daemon.run().map_err(|e| e.display_chain())
});
let exit_code = match result {
@@ -88,7 +88,7 @@ fn run_service() -> Result<(), String> {
persistent_service_status.set_stopped(exit_code).unwrap();
- result.map_err(|e| e.display_chain())
+ result
}
/// Start event monitor thread that polls for `ServiceControl` and translates them into calls to