From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup 3/8] config: add JobState helper
Date: Mon, 3 Aug 2020 09:38:08 +0200 (CEST) [thread overview]
Message-ID: <1787681560.48.1596440288596@webmail.proxmox.com> (raw)
In-Reply-To: <20200731124330.30576-4-d.csapak@proxmox.com>
suggested cleanups:
diff --git a/src/config/jobstate.rs b/src/config/jobstate.rs
index fb5a8cb..974b8e9 100644
--- a/src/config/jobstate.rs
+++ b/src/config/jobstate.rs
@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
use std::time::Duration;
use serde::{Serialize, Deserialize};
-use anyhow::{bail, Error, format_err};
+use anyhow::{Error, format_err};
use proxmox::tools::fs::{file_read_optional_string, replace_file, create_path, CreateOptions};
use crate::tools::{epoch_now_u64, open_file_locked};
@@ -48,19 +48,15 @@ where
{
let mut path = path.as_ref().to_path_buf();
path.set_extension("lck");
- let lock = open_file_locked(path, Duration::new(10, 0))?;
- Ok(lock)
+ open_file_locked(path, Duration::new(10, 0))
}
pub fn remove_state_file(jobtype: &str, jobname: &str) -> Result<(), Error> {
let path = get_path(jobtype, jobname)?;
let _lock = get_lock(&path)?;
- match std::fs::remove_file(&path) {
- Ok(()) => Ok(()),
- Err(err) => {
- bail!("cannot remove statefile for {} - {}: {}", jobtype, jobname, err);
- }
- }
+ std::fs::remove_file(&path).map_err(|err| {
+ format_err!("cannot remove statefile for {} - {}: {}", jobtype, jobname, err)
+ })
}
impl JobState {
next prev parent reply other threads:[~2020-08-03 7:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 12:43 [pbs-devel] [PATCH proxmox-backup 0/8] improve syncjob handling Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 1/8] worker_task: refactor log text generator Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 2/8] worker_task: add getter for upid Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 3/8] config: add JobState helper Dominik Csapak
2020-08-03 7:35 ` Dietmar Maurer
2020-08-03 7:38 ` Dietmar Maurer [this message]
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 4/8] api2/pull: add do_syn_job helper Dominik Csapak
2020-08-03 7:42 ` Dietmar Maurer
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 5/8] syncjob: use do_sync_job for manual and scheduled sync jobs Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 6/8] syncjob: use JobState for determining when to run next scheduled sync Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 7/8] api2/admin/sync: use JobState for faster access to state info Dominik Csapak
2020-07-31 12:43 ` [pbs-devel] [PATCH proxmox-backup 8/8] ui: syncjob: use the Task text directly Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1787681560.48.1596440288596@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.