From 541b908ea4c50cdc9993a8519b78f859607f505f Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 28 Feb 2019 17:03:48 +0100 Subject: [PATCH] src/backup/datastore.rs: use DateTime instead of unix epoch --- src/api2/admin/datastore/catar.rs | 3 ++- src/backup/datastore.rs | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api2/admin/datastore/catar.rs b/src/api2/admin/datastore/catar.rs index 265cfa1d..80b2e4bd 100644 --- a/src/api2/admin/datastore/catar.rs +++ b/src/api2/admin/datastore/catar.rs @@ -81,7 +81,8 @@ fn upload_catar( let datastore = DataStore::lookup_datastore(store)?; - let (mut path, _new) = datastore.create_backup_dir(backup_type, backup_id, backup_time)?; + let (mut path, _new) = datastore.create_backup_dir( + backup_type, backup_id, Utc.timestamp(backup_time, 0))?; path.push(archive_name); diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 85d16456..faf2a08f 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -195,7 +195,7 @@ impl DataStore { &self, backup_type: &str, backup_id: &str, - backup_time: i64, + backup_time: DateTime, ) -> Result<(PathBuf, bool), io::Error> { let mut relative_path = PathBuf::new(); @@ -208,8 +208,7 @@ impl DataStore { full_path.push(&relative_path); std::fs::create_dir_all(&full_path)?; - let dt = Utc.timestamp(backup_time, 0); - let date_str = dt.format("%Y-%m-%dT%H:%M:%S").to_string(); + let date_str = backup_time.format("%Y-%m-%dT%H:%M:%S").to_string(); println!("date: {}", date_str); relative_path.push(&date_str);