Unlock daemon lock file before exiting

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Dec 24, 2024 · ea6da7e · ea6da7e
1 parent 8487a88
commit ea6da7e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock
diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml
@@ -24,6 +24,7 @@ whoami = "1.5.0"
 yansi = "0.5.1"
 
 [target.'cfg(windows)'.dependencies]
+defer = "0.2.1"
 fslock = "0.2.1"
 windows-sys = "0.52.0"
 

diff --git a/zowex/src/run.rs b/zowex/src/run.rs
@@ -24,6 +24,8 @@ use std::time::Duration;
 use base64::prelude::*;
 use is_terminal::IsTerminal;
 
+#[cfg(target_family = "windows")]
+extern crate defer;
 #[cfg(target_family = "windows")]
 extern crate fslock;
 #[cfg(target_family = "windows")]
@@ -314,6 +316,8 @@ pub async fn run_daemon_command(
 
     #[cfg(target_family = "windows")]
     let mut lock_file = get_win_lock_file()?;
+    #[cfg(target_family = "windows")]
+    defer::defer! { lock_file.unlock() };
 
     #[cfg(target_family = "windows")]
     let mut locked = false;