src/bin/proxmox-backup-client.rs: simply log to stdout

This commit is contained in:
Dietmar Maurer 2019-03-04 09:38:34 +01:00
parent f72dfd2d10
commit cdebd467e6

View File

@ -2,11 +2,10 @@ extern crate proxmox_backup;
use failure::*; use failure::*;
//use std::os::unix::io::AsRawFd; //use std::os::unix::io::AsRawFd;
use chrono::{DateTime, Local, Utc, TimeZone}; use chrono::{DateTime, Local, TimeZone};
use std::path::Path; use std::path::Path;
use proxmox_backup::tools; use proxmox_backup::tools;
use proxmox_backup::flog;
use proxmox_backup::cli::*; use proxmox_backup::cli::*;
use proxmox_backup::api_schema::*; use proxmox_backup::api_schema::*;
use proxmox_backup::api_schema::router::*; use proxmox_backup::api_schema::router::*;
@ -33,7 +32,7 @@ fn backup_directory<P: AsRef<Path>>(
repo: &BackupRepository, repo: &BackupRepository,
dir_path: P, dir_path: P,
archive_name: &str, archive_name: &str,
backup_time: DateTime<Utc>, backup_time: DateTime<Local>,
chunk_size: Option<u64>, chunk_size: Option<u64>,
verbose: bool, verbose: bool,
) -> Result<(), Error> { ) -> Result<(), Error> {
@ -341,34 +340,25 @@ fn create_backup(
} }
} }
let backup_time = Utc::now(); let backup_time = Local.timestamp(Local::now().timestamp(), 0);
let mut client = HttpClient::new(&repo.host, &repo.user); let mut client = HttpClient::new(&repo.host, &repo.user);
client.login()?; // login before starting backup client.login()?; // login before starting backup
let log_file_name = format!("backup-log-{}.log", backup_time.format("%Y-%m-%dT%H:%M:%S")); println!("Starting backup");
println!("Client name: {}", tools::nodename());
let mut log = tools::FileLogger::new(&log_file_name, true)?; println!("Start Time: {}", backup_time.to_rfc3339());
flog!(log, "Starting backup");
flog!(log, "Client name: {}", tools::nodename());
flog!(log, "UTC Start Time: {}", Utc::now().format("%c"));
for (filename, target) in upload_list { for (filename, target) in upload_list {
flog!(log, "Upload '{}' to '{:?}' as {}", filename, repo, target); println!("Upload '{}' to '{:?}' as {}", filename, repo, target);
backup_directory(&mut client, &repo, &filename, &target, backup_time, chunk_size_opt, verbose)?; backup_directory(&mut client, &repo, &filename, &target, backup_time, chunk_size_opt, verbose)?;
} }
flog!(log, "Upload backup log"); let end_time = Local.timestamp(Local::now().timestamp(), 0);
// fixme: impl upload log println!("End Time: {}", end_time.to_rfc3339());
flog!(log, "UTC End Time: {}", Utc::now().format("%c"));
//datastore.garbage_collection()?;
Ok(Value::Null) Ok(Value::Null)
} }
pub fn complete_backup_source(arg: &str) -> Vec<String> { pub fn complete_backup_source(arg: &str) -> Vec<String> {