Selaa lähdekoodia

[minor] backup naming to use datetime_random_string_database.sql instead of date_random_number_database.sql

version-14
Anand Doshi 9 vuotta sitten
vanhempi
commit
b01edff59a
2 muutettua tiedostoa jossa 8 lisäystä ja 6 poistoa
  1. +1
    -0
      frappe/utils/__init__.py
  2. +7
    -6
      frappe/utils/backups.py

+ 1
- 0
frappe/utils/__init__.py Näytä tiedosto

@@ -496,6 +496,7 @@ def get_site_info():
for u in users: for u in users:
# tag system managers # tag system managers
u.is_system_manager = 1 if u.name in system_managers else 0 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') system_settings = frappe.db.get_singles_dict('System Settings')
space_usage = frappe._dict((frappe.local.conf.limits or {}).get('space_usage', {})) space_usage = frappe._dict((frappe.local.conf.limits or {}).get('space_usage', {}))


+ 7
- 6
frappe/utils/backups.py Näytä tiedosto

@@ -9,7 +9,7 @@ from __future__ import unicode_literals
from frappe import _ from frappe import _
import os, frappe import os, frappe
from datetime import datetime from datetime import datetime
from frappe.utils import cstr, get_url
from frappe.utils import cstr, get_url, now_datetime


#Global constants #Global constants
verbose = 0 verbose = 0
@@ -59,13 +59,14 @@ class BackupGenerator:


def set_backup_file_name(self): def set_backup_file_name(self):
import random 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 #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() backup_path = get_backup_path()


if not self.backup_path_db: if not self.backup_path_db:


Ladataan…
Peruuta
Tallenna