diff options
author | Didier Wenzek <didier.wenzek@acidalie.com> | 2022-08-30 11:39:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-30 11:39:39 +0200 |
commit | bb1653fa3cf1997e984c5df73ec284631cc475ed (patch) | |
tree | 5fd102573afaf6642b369a891792fbda4036d95f | |
parent | 61882a9660170cbbd5b9e8ad010102d8ffd91580 (diff) | |
parent | f5b7f376e00950bba6eef07d2ef093174d702389 (diff) |
Merge pull request #1350 from matthiasbeyer/flockfile-misc-refactoring
Flockfile misc refactorings
-rw-r--r-- | crates/common/flockfile/src/unix.rs | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/crates/common/flockfile/src/unix.rs b/crates/common/flockfile/src/unix.rs index ce0e29f0..72fe1260 100644 --- a/crates/common/flockfile/src/unix.rs +++ b/crates/common/flockfile/src/unix.rs @@ -26,6 +26,15 @@ pub enum FlockfileError { }, } +impl FlockfileError { + fn path(&self) -> &Path { + match self { + FlockfileError::FromIo { path, .. } => path, + FlockfileError::FromNix { path, .. } => path, + } + } +} + /// flockfile creates a lockfile in the filesystem under `/run/lock` and then creates a filelock using system fcntl with flock. /// flockfile will automatically remove lockfile on application exit and the OS should cleanup the filelock afterwards. /// If application exits unexpectedly the filelock will be dropped, but the lockfile will not be removed unless handled in signal handler. @@ -44,24 +53,22 @@ impl Flockfile { /// pub fn new_lock(path: impl AsRef<Path>) -> Result<Flockfile, FlockfileError> { let path = PathBuf::new().join(path); - let file = match OpenOptions::new() + let file = OpenOptions::new() .create(true) .read(true) .write(true) .open(&path) - { - Ok(file) => file, - Err(err) => { - return Err(FlockfileError::FromIo { path, source: err }); - } - }; - - match flock(file.as_raw_fd(), FlockArg::LockExclusiveNonblock) { - Ok(()) => (), - Err(err) => { - return Err(FlockfileError::FromNix { path, source: err }); + .map_err(|err| FlockfileError::FromIo { + path: path.clone(), + source: err, + })?; + + flock(file.as_raw_fd(), FlockArg::LockExclusiveNonblock).map_err(|err| { + FlockfileError::FromNix { + path: path.clone(), + source: err, } - }; + })?; info!(r#"Lockfile created {:?}"#, &path); Ok(Flockfile { @@ -112,12 +119,10 @@ pub fn check_another_instance_is_not_running( ) -> Result<Flockfile, FlockfileError> { let lock_path = run_dir.join(format!("{}{}.lock", LOCK_CHILD_DIRECTORY, app_name)); - Flockfile::new_lock(lock_path.as_path()).map_err(|err| match &err { - FlockfileError::FromIo { path, .. } | FlockfileError::FromNix { path, .. } => { - error!("Another instance of {} is running.", app_name); - error!("Lock file path: {}", path.as_path().to_str().unwrap()); - err - } + Flockfile::new_lock(lock_path.as_path()).map_err(|err| { + error!("Another instance of {} is running.", app_name); + error!("Lock file path: {}", err.path().to_str().unwrap()); + err }) } |