summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-03-07 16:02:53 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-03-07 16:02:53 +0100
commitb249208b4877653af0dc9aa4510395333f5da255 (patch)
treea233ffa89ab7da249c81319f13482bafb7a1e03c
parent552c720753fc9dd0560db621c5aec23b39be10eb (diff)
parent3bc5edd9a13142fb31902801e13b4ec19c1d6d6e (diff)
downloadmullvadvpn-b249208b4877653af0dc9aa4510395333f5da255.tar.xz
mullvadvpn-b249208b4877653af0dc9aa4510395333f5da255.zip
Merge branch 'suppress-not-found-error'
-rw-r--r--mullvad-daemon/src/target_state.rs20
1 files changed, 12 insertions, 8 deletions
diff --git a/mullvad-daemon/src/target_state.rs b/mullvad-daemon/src/target_state.rs
index fcd4eacde6..cc3094b986 100644
--- a/mullvad-daemon/src/target_state.rs
+++ b/mullvad-daemon/src/target_state.rs
@@ -95,10 +95,12 @@ impl PersistentTargetState {
return;
}
let _ = fs::remove_file(&self.cache_path).await.map_err(|error| {
- log::error!(
- "{}",
- error.display_chain_with_msg("Cannot delete target tunnel state cache")
- );
+ if error.kind() != io::ErrorKind::NotFound {
+ log::error!(
+ "{}",
+ error.display_chain_with_msg("Cannot delete target tunnel state cache")
+ );
+ }
});
// prevent the sync destructor from running
self.locked = true;
@@ -134,10 +136,12 @@ impl Drop for PersistentTargetState {
return;
}
let _ = std::fs::remove_file(&self.cache_path).map_err(|error| {
- log::error!(
- "{}",
- error.display_chain_with_msg("Cannot delete target tunnel state cache")
- );
+ if error.kind() != io::ErrorKind::NotFound {
+ log::error!(
+ "{}",
+ error.display_chain_with_msg("Cannot delete target tunnel state cache")
+ );
+ }
});
}
}