From bcc861ad28ac6a774d879a7c9671b17c135a51e7 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Fri, 15 Sep 2017 15:32:11 +0530 Subject: [PATCH] [minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.* --- frappe/utils/backups.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index d3a7b74ac4..2e27e9ec74 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -61,12 +61,13 @@ class BackupGenerator: import random todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') - random_string = frappe.generate_hash(length=8) + site = frappe.local.site or frappe.generate_hash(length=8) + site = site.replace('.', '_') #Generate a random name using today's date and a 8 digit random number - for_db = todays_date + "_" + random_string + "_database.sql.gz" - for_public_files = todays_date + "_" + random_string + "_files.tar" - for_private_files = todays_date + "_" + random_string + "_private_files.tar" + for_db = todays_date + "_" + site + "_database.sql.gz" + for_public_files = todays_date + "_" + site + "_files.tar" + for_private_files = todays_date + "_" + site + "_private_files.tar" backup_path = get_backup_path() if not self.backup_path_db: