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

switch from create_dir_chown to create_path 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-21 12:21:56 +02:00
parent 170535addd
commit 35238e234d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/worker_task.rs
View File

@ -15,7 +15,7 @@ use serde_json::{json, Value};
use proxmox::tools::{ use proxmox::tools::{
try_block, try_block,
fs::{create_dir_chown, file_set_contents_full}, fs::{create_path, file_set_contents_full, CreateOptions},
}; };
use super::UPID; use super::UPID;
@ -142,12 +142,13 @@ pub fn create_task_log_dirs() -> Result<(), Error> {
try_block!({ try_block!({
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?; let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
let uid = Some(nix::unistd::Uid::from_raw(backup_uid)); let opts = CreateOptions::new()
let gid = Some(nix::unistd::Gid::from_raw(backup_gid)); .owner(nix::unistd::Uid::from_raw(backup_uid))
.group(nix::unistd::Gid::from_raw(backup_gid));
create_dir_chown(PROXMOX_BACKUP_LOG_DIR, None, uid, gid)?; create_path(PROXMOX_BACKUP_LOG_DIR, None, Some(opts.clone()))?;
create_dir_chown(PROXMOX_BACKUP_TASK_DIR, None, uid, gid)?; create_path(PROXMOX_BACKUP_TASK_DIR, None, Some(opts.clone()))?;
create_dir_chown(PROXMOX_BACKUP_VAR_RUN_DIR, None, uid, gid)?; create_path(PROXMOX_BACKUP_VAR_RUN_DIR, None, Some(opts))?;
Ok(()) Ok(())
}).map_err(|err: Error| format_err!("unable to create task log dir - {}", err))?; }).map_err(|err: Error| format_err!("unable to create task log dir - {}", err))?;
@ -369,17 +370,17 @@ impl WorkerTask {
path.push(format!("{:02X}", upid.pstart % 256)); path.push(format!("{:02X}", upid.pstart % 256));
let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?; let (backup_uid, backup_gid) = crate::tools::getpwnam_ugid("backup")?;
let uid = Some(nix::unistd::Uid::from_raw(backup_uid)); let uid = nix::unistd::Uid::from_raw(backup_uid);
let gid = Some(nix::unistd::Gid::from_raw(backup_gid)); let gid = nix::unistd::Gid::from_raw(backup_gid);
create_dir_chown(&path, None, uid, gid)?; create_path(&path, None, Some(CreateOptions::new().owner(uid).group(gid)))?;
path.push(upid.to_string()); path.push(upid.to_string());
println!("FILE: {:?}", path); println!("FILE: {:?}", path);
let logger = FileLogger::new(&path, to_stdout)?; let logger = FileLogger::new(&path, to_stdout)?;
nix::unistd::chown(&path, uid, gid)?; nix::unistd::chown(&path, Some(uid), Some(gid))?;
update_active_workers(Some(&upid))?; update_active_workers(Some(&upid))?;