tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/api2/config: correctly lock files

This commit is contained in:
Dietmar Maurer 2020-01-15 11:57:12 +01:00
parent 1c79e1017f
commit 347834df25
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api2/config/datastore.rs
View File

@ -53,7 +53,7 @@ pub fn list_datastores(
/// Create new datastore config.
pub fn create_datastore(name: String, param: Value) -> Result<(), Error> {
// fixme: locking ?
let _lock = crate::tools::open_file_locked(datastore::DATASTORE_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
let datastore: datastore::DataStoreConfig = serde_json::from_value(param.clone())?;
@ -122,7 +122,8 @@ pub fn update_datastore(
path: Option<String>,
) -> Result<(), Error> {
// fixme: locking ?
let _lock = crate::tools::open_file_locked(datastore::DATASTORE_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
// pass/compare digest
let (mut config, _digest) = datastore::config()?;

5
src/api2/config/remotes.rs
View File

@ -56,7 +56,7 @@ pub fn list_remotes(
/// Create new remote.
pub fn create_remote(name: String, param: Value) -> Result<(), Error> {
// fixme: locking ?
let _lock = crate::tools::open_file_locked(remotes::REMOTES_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
let remote: remotes::Remote = serde_json::from_value(param.clone())?;
@ -130,7 +130,8 @@ pub fn update_remote(
password: Option<String>,
) -> Result<(), Error> {
// fixme: locking ?
let _lock = crate::tools::open_file_locked(remotes::REMOTES_CFG_LOCKFILE, std::time::Duration::new(10, 0))?;
// pass/compare digest
let (mut config, _digest) = remotes::config()?;

3
src/config/datastore.rs
View File

@ -49,7 +49,8 @@ fn init() -> SectionConfig {
config
}
const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg";
pub const DATASTORE_CFG_FILENAME: &str = "/etc/proxmox-backup/datastore.cfg";
pub const DATASTORE_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.datastore.lck";
pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
let content = match std::fs::read_to_string(DATASTORE_CFG_FILENAME) {

3
src/config/remotes.rs
View File

@ -60,7 +60,8 @@ fn init() -> SectionConfig {
config
}
const REMOTES_CFG_FILENAME: &str = "/etc/proxmox-backup/remotes.cfg";
pub const REMOTES_CFG_FILENAME: &str = "/etc/proxmox-backup/remotes.cfg";
pub const REMOTES_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.remotes.lck";
pub fn config() -> Result<(SectionConfigData, [u8;32]), Error> {
let content = match std::fs::read_to_string(REMOTES_CFG_FILENAME) {