← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:charm-reload-celery into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:charm-reload-celery into launchpad:master.

Commit message:
charm: Reload celery on logrotate rather than restarting it

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/450662

This allows jobs currently in progress to finish, so is a bit more graceful.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-reload-celery into launchpad:master.
diff --git a/charm/launchpad-scripts-bzrsyncd/templates/logrotate.conf.j2 b/charm/launchpad-scripts-bzrsyncd/templates/logrotate.conf.j2
index fc28d9d..5a57389 100644
--- a/charm/launchpad-scripts-bzrsyncd/templates/logrotate.conf.j2
+++ b/charm/launchpad-scripts-bzrsyncd/templates/logrotate.conf.j2
@@ -6,8 +6,8 @@
         delaycompress
         sharedscripts
         postrotate
-            systemctl restart celeryd_bzrsyncd_job
-            systemctl restart celeryd_bzrsyncd_job_slow
+            systemctl reload celeryd_bzrsyncd_job
+            systemctl reload celeryd_bzrsyncd_job_slow
         endscript
 }
 
diff --git a/charm/launchpad-scripts/templates/logrotate.conf.j2 b/charm/launchpad-scripts/templates/logrotate.conf.j2
index df26563..cddada5 100644
--- a/charm/launchpad-scripts/templates/logrotate.conf.j2
+++ b/charm/launchpad-scripts/templates/logrotate.conf.j2
@@ -6,8 +6,8 @@
         delaycompress
         sharedscripts
         postrotate
-            systemctl restart celeryd_launchpad_job
-            systemctl restart celeryd_launchpad_job_slow
+            systemctl reload celeryd_launchpad_job
+            systemctl reload celeryd_launchpad_job_slow
         endscript
 }