launchpad-reviewers team mailing list archive

[Colin Watson <mp+439746@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-codeimport:charm-remove-stray-logrotate into lp-codeimport:master.

Commit message:
charm: Remove stray logrotate cron job

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-codeimport/+git/lp-codeimport/+merge/439746

We put our `logrotate` configuration in `/etc/logrotate.d/`, so we don't need a separate cron job for it.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-codeimport:charm-remove-stray-logrotate into lp-codeimport:master.

diff --git a/charm/lp-codeimport/templates/crontab.j2 b/charm/lp-codeimport/templates/crontab.j2
index b3cfdc0..487f4e6 100644
--- a/charm/lp-codeimport/templates/crontab.j2
+++ b/charm/lp-codeimport/templates/crontab.j2
@@ -4,8 +4,6 @@ MAILTO={{ error_email }}
 LPCONFIG=charm
 LP_PY={{ code_dir }}/bin/py
 
-0 0 * * 1,4	/usr/sbin/logrotate -s ~/.logrotate.state {{ etc_dir }}/logrotate.conf
-
 * * * * *	sleep {{ dispatch_offset }} && [ -f {{ base_dir }}/maintenance.txt ] || {{ code_dir }}/cronscripts/code-import-dispatcher.py -v --max-jobs=10 --log-file {{ logs_dir }}/code-import-dispatcher.log >> {{ logs_dir }}/code-import-dispatcher-out.log 2>&1
 * * * * *	sleep {{ dispatch_offset + 30 }} && [ -f {{ base_dir }}/maintenance.txt ] || {{ code_dir }}/cronscripts/code-import-dispatcher.py -v --max-jobs=10 --log-file {{ logs_dir }}/code-import-dispatcher.log >> {{ logs_dir }}/code-import-dispatcher-out.log 2>&1