vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #10097 from fumin/patch-5

Browse source 
fix: backups on mariadb listening on other ports
This commit is contained in:
mergify[bot] 2020-04-27 11:05:19 +00:00 • committed by GitHub
commit 3c6da9e429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/utils/backups.py
View file

@ -23,8 +23,9 @@ class BackupGenerator:
If specifying db_file_name, also append ".sql.gz"
"""
def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None,
backup_path_private_files=None, db_host="localhost"):
backup_path_private_files=None, db_host="localhost", db_port=3306):
self.db_host = db_host
self.db_port = db_port
self.db_name = db_name
self.user = user
self.password = password
@ -108,10 +109,10 @@ class BackupGenerator:
import frappe.utils
# escape reserved characters
args = dict([item[0], frappe.utils.esc(item[1], '$ ')]
args = dict([item[0], frappe.utils.esc(str(item[1]), '$ ')]
for item in self.__dict__.copy().items())
cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s | gzip > %(backup_path_db)s """ % args
cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s | gzip > %(backup_path_db)s """ % args
err, out = frappe.utils.execute_in_shell(cmd_string)
def send_email(self):
@ -171,7 +172,8 @@ def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_pat
frappe.conf.db_password,
backup_path_db=backup_path_db, backup_path_files=backup_path_files,
backup_path_private_files=backup_path_private_files,
db_host = frappe.db.host)
db_host = frappe.db.host,
db_port = frappe.db.port)
odb.get_backup(older_than, ignore_files, force=force)
return odb