Skip to content

Commit 313247b

Browse files
committed
try not using env vars in systemd script
1 parent 0fcbac3 commit 313247b

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

salt/roots/junction/celery.sls

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ broker:
1111
- template: jinja
1212
- defaults:
1313
name: "{{name}}"
14+
celery_bin: "/opt/envs/{{name}}/bin/celery"
15+
celery_pid: "/var/run/{{name}}_celery/%N.pid"
16+
celery_log: "/opt/{{name}}/logs/celery_junction.log"
1417
- user: app
1518

1619
{{name}}_celery:

salt/roots/junction/files/celery.conf.j2

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ After=network.target
77
[Service]
88
User=app
99
Type=forking
10-
EnvironmentFile='DJANGO_SETTINGS_MODULE="settings"' 'SITE_NAME="{{name}} Celery"' 'LANG="en_US.UTF-8"' 'CELERY_BIN=/opt/envs/{{name}}/bin/celery' 'CELERY_PID=/usr/run/{{name}}_celery/%N.pid' 'CELERY_LOG=/opt/{{name}}/logs/celery_junction.log'
11-
ExecStart=/opt/envs/{{name}}/bin/celery -A junction worker -l info
10+
EnvironmentFile='DJANGO_SETTINGS_MODULE="settings"' 'SITE_NAME="{{name}} Celery"' 'LANG="en_US.UTF-8"'
1211
WorkingDirectory=/opt/{{name}}/
13-
ExecStart=/bin/sh -c '${CELERY_BIN} multi start {{name}} \
14-
-A {{name}} --pidfile=${CELERY_PID} \
15-
--logfile=${CELERY_LOG} --loglevel=info ${CELERYD_OPTS}'
16-
ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait {{name}} \
17-
--pidfile=${CELERY_PID}'
18-
ExecReload=/bin/sh -c '${CELERY_BIN} multi restart {{name}} \
19-
-A {{name}} --pidfile=${CELERY_PID} \
20-
--logfile=${CELERY_LOG} --loglevel=info ${CELERYD_OPTS}'
12+
ExecStart=/bin/sh -c '{{celery_bin}} multi start {{name}} \
13+
-A {{name}} --pidfile={{celery_pid}} \
14+
--logfile={{celery_log}} --loglevel=info'
15+
ExecStop=/bin/sh -c '{{celery_bin}} multi stopwait {{name}} \
16+
--pidfile={{celery_pid}}'
17+
ExecReload=/bin/sh -c '{{celery_bin}} multi restart {{name}} \
18+
-A {{name}} --pidfile={{celery_pid}} \
19+
--logfile={{celery_log}} --loglevel=info'
2120
StandardError=syslog
2221
TimeoutSec=300
2322
NotifyAccess=all

0 commit comments

Comments
 (0)