From b01edff59a4f356aaad5e64841f784dcf18d5236 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 1 Jul 2016 15:34:11 +0530 Subject: [PATCH] [minor] backup naming to use datetime_random_string_database.sql instead of date_random_number_database.sql --- frappe/utils/__init__.py | 1 + frappe/utils/backups.py | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 4462fe13e6..fbffebf77d 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -496,6 +496,7 @@ def get_site_info(): for u in users: # tag system managers u.is_system_manager = 1 if u.name in system_managers else 0 + u.full_name = get_fullname(u.name) system_settings = frappe.db.get_singles_dict('System Settings') space_usage = frappe._dict((frappe.local.conf.limits or {}).get('space_usage', {})) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index a6bbbb1882..2ef96cc27d 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -9,7 +9,7 @@ from __future__ import unicode_literals from frappe import _ import os, frappe from datetime import datetime -from frappe.utils import cstr, get_url +from frappe.utils import cstr, get_url, now_datetime #Global constants verbose = 0 @@ -59,13 +59,14 @@ class BackupGenerator: def set_backup_file_name(self): import random - todays_date = "".join(str(datetime.date(datetime.today())).split("-")) - random_number = str(int(random.random()*99999999)) + + todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') + random_string = frappe.generate_hash(length=8) #Generate a random name using today's date and a 8 digit random number - for_db = todays_date + "_" + random_number + "_database.sql.gz" - for_public_files = todays_date + "_" + random_number + "_files.tar" - for_private_files = todays_date + "_" + random_number + "_private_files.tar" + 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" backup_path = get_backup_path() if not self.backup_path_db: