← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~lgp171188/launchpad:add-extra-config-bzrsyncd-celerybeat into launchpad:master

 

Guruprasad has proposed merging ~lgp171188/launchpad:add-extra-config-bzrsyncd-celerybeat into launchpad:master.

Commit message:
charm/launchpad-scripts-bzrsyncd: Add missing config to the celerybeat service

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This should make the service's ExecStart value be similar to that of the celerybeat service in the `launchpad-scripts` charm. See https://git.launchpad.net/launchpad/tree/charm/launchpad-scripts/templates/celerybeat_launchpad.service.j2.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:add-extra-config-bzrsyncd-celerybeat into launchpad:master.
diff --git a/charm/launchpad-scripts-bzrsyncd/templates/celerybeat_bzrsyncd.service.j2 b/charm/launchpad-scripts-bzrsyncd/templates/celerybeat_bzrsyncd.service.j2
index 598aecc..5ef40f8 100644
--- a/charm/launchpad-scripts-bzrsyncd/templates/celerybeat_bzrsyncd.service.j2
+++ b/charm/launchpad-scripts-bzrsyncd/templates/celerybeat_bzrsyncd.service.j2
@@ -6,7 +6,11 @@ After=syslog.target network.target remote-fs.target nss-lookup.target
 Environment=LPCONFIG=launchpad-scripts-bzrsyncd
 User=launchpad
 WorkingDirectory={{ code_dir }}
-ExecStart={{ code_dir }}/bin/celery beat --config=lp.services.job.celeryconfig
+ExecStart={{ code_dir }}/bin/celery beat \
+    --config=lp.services.job.celeryconfig \
+    --pidfile={{ var_dir }}/celerybeat_bzrsyncd.pid \
+    --logfile={{ logs_dir }}/celerybeat_bzrsyncd.log \
+    --schedule={{ var_dir }}/celerybeat-schedule.db
 Restart=on-failure
 LimitNOFILE=10000