Merge pull request #28 from JustEnoughVCS/jvcs_dev_actions

Fix error handling in process_connection

2 files changed, 3 insertions, 5 deletions

diff --git a/crates/vcs_actions/src/connection/action_service.rs b/crates/vcs_actions/src/connection/action_service.rs
index f787cae..ca236e7 100644
--- a/crates/vcs_actions/src/connection/action_service.rs
+++ b/crates/vcs_actions/src/connection/action_service.rs
@@ -200,7 +200,6 @@ async fn process_connection(stream: TcpStream, vault: Arc<Vault>, action_pool: A
         Ok(_result_json) => {}
         Err(e) => {
             warn!("Failed to process action `{}`: {}", msg.action_name, e);
-            return;
         }
-    };
+    }
 }
diff --git a/crates/vcs_data/src/data/vault/service.rs b/crates/vcs_data/src/data/vault/service.rs
index 9fdce85..22e91d5 100644
--- a/crates/vcs_data/src/data/vault/service.rs
+++ b/crates/vcs_data/src/data/vault/service.rs
@@ -33,11 +33,10 @@ impl Vault {
 
     /// Unlock the current Vault
     pub fn unlock(&self) -> Result<(), std::io::Error> {
-        if let Err(e) = std::fs::remove_file(self.lock_file_path()) {
-            if e.kind() != std::io::ErrorKind::NotFound {
+        if let Err(e) = std::fs::remove_file(self.lock_file_path())
+            && e.kind() != std::io::ErrorKind::NotFound {
                 return Err(e);
             }
-        }
         Ok(())
     }
 }