From 691687edbef00238166cd209717e66cd9fb74944 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Wed, 1 Jul 2020 18:54:41 +0530 Subject: [PATCH 1/2] fix: run backups every 6 hours, rather than every minute per 6 hours --- bench/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/utils.py b/bench/utils.py index d94fc26b..948d62ea 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -400,7 +400,7 @@ def setup_backups(bench_path='.'): if job_command not in str(system_crontab): job = system_crontab.new(command=job_command, comment="bench auto backups set for every 6 hours") - job.hour.every(6) + job.every(6).hours() system_crontab.write() From e5c3b591f7c7da9ab2aad62e2996831371ec0890 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Mon, 6 Jul 2020 16:52:09 +0530 Subject: [PATCH 2/2] patch: fix old auto-backup cron jobs --- bench/patches/patches.txt | 1 + bench/patches/v5/fix_backup_cronjob.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 bench/patches/v5/fix_backup_cronjob.py diff --git a/bench/patches/patches.txt b/bench/patches/patches.txt index 7cb1a076..55a65019 100644 --- a/bench/patches/patches.txt +++ b/bench/patches/patches.txt @@ -5,3 +5,4 @@ bench.patches.v4.update_node bench.patches.v4.update_socketio bench.patches.v4.install_yarn #2 bench.patches.v5.fix_user_permissions +bench.patches.v5.fix_backup_cronjob diff --git a/bench/patches/v5/fix_backup_cronjob.py b/bench/patches/v5/fix_backup_cronjob.py new file mode 100644 index 00000000..15bbfcf3 --- /dev/null +++ b/bench/patches/v5/fix_backup_cronjob.py @@ -0,0 +1,15 @@ +from bench.config.common_site_config import get_config +from crontab import CronTab + + +def execute(bench_path): + """ + This patch fixes a cron job that would backup sites every minute per 6 hours + """ + + user = get_config(bench_path=bench_path).get('frappe_user') + user_crontab = CronTab(user=user) + + for job in user_crontab.find_comment("bench auto backups set for every 6 hours"): + job.every(6).hours() + user_crontab.write()