Ensure the SystemD services are up to date.

celery · Oct 8, 2020 · 393a31d · 393a31d
1 parent cc36c27
commit 393a31d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 45 deletions.
diff --git a/docs/userguide/daemonizing.rst b/docs/userguide/daemonizing.rst
@@ -389,27 +389,28 @@ This is an example systemd file:
 
 .. code-block:: bash
 
-  [Unit]
-  Description=Celery Service
-  After=network.target
-
-  [Service]
-  Type=forking
-  User=celery
-  Group=celery
-  EnvironmentFile=/etc/conf.d/celery
-  WorkingDirectory=/opt/celery
-  ExecStart=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} multi start ${CELERYD_NODES} \
-    --pidfile=${CELERYD_PID_FILE} \
-    --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
-  ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} \
-    --pidfile=${CELERYD_PID_FILE}'
-  ExecReload=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} multi restart ${CELERYD_NODES} \
-    --pidfile=${CELERYD_PID_FILE} \
-    --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
-
-  [Install]
-  WantedBy=multi-user.target
+    [Unit]
+    Description=Celery Service
+    After=network.target
+
+    [Service]
+    Type=forking
+    User=celery
+    Group=celery
+    EnvironmentFile=/etc/conf.d/celery
+    WorkingDirectory=/opt/celery
+    ExecStart=/bin/sh -c '${CELERY_BIN} -A $CELERY_APP multi start $CELERYD_NODES \
+        --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
+        --loglevel="${CELERYD_LOG_LEVEL}" $CELERYD_OPTS'
+    ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait $CELERYD_NODES \
+        --pidfile=${CELERYD_PID_FILE} --loglevel="${CELERYD_LOG_LEVEL}"'
+    ExecReload=/bin/sh -c '${CELERY_BIN} -A $CELERY_APP multi restart $CELERYD_NODES \
+        --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
+        --loglevel="${CELERYD_LOG_LEVEL}" $CELERYD_OPTS'
+    Restart=always
+
+    [Install]
+    WantedBy=multi-user.target
 
 Once you've put that file in :file:`/etc/systemd/system`, you should run
 :command:`systemctl daemon-reload` in order that Systemd acknowledges that file.
@@ -482,22 +483,22 @@ This is an example systemd file for Celery Beat:
 
 .. code-block:: bash
 
-  [Unit]
-  Description=Celery Beat Service
-  After=network.target
-
-  [Service]
-  Type=simple
-  User=celery
-  Group=celery
-  EnvironmentFile=/etc/conf.d/celery
-  WorkingDirectory=/opt/celery
-  ExecStart=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} beat  \
-    --pidfile=${CELERYBEAT_PID_FILE} \
-    --logfile=${CELERYBEAT_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL}'
-
-  [Install]
-  WantedBy=multi-user.target
+    [Unit]
+    Description=Celery Beat Service
+    After=network.target
+
+    [Service]
+    Type=simple
+    User=celery
+    Group=celery
+    EnvironmentFile=/etc/conf.d/celery
+    WorkingDirectory=/opt/celery
+    ExecStart=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} beat  \
+        --pidfile=${CELERYBEAT_PID_FILE} \
+        --logfile=${CELERYBEAT_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL}'
+
+    [Install]
+    WantedBy=multi-user.target
 
 
 Running the worker with superuser privileges (root)

diff --git a/extra/systemd/celery.service b/extra/systemd/celery.service
@@ -8,13 +8,13 @@ User=celery
 Group=celery
 EnvironmentFile=-/etc/conf.d/celery
 WorkingDirectory=/opt/celery
-ExecStart=/bin/sh -c '${CELERY_BIN} multi start $CELERYD_NODES \
-	-A $CELERY_APP --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
+ExecStart=/bin/sh -c '${CELERY_BIN} -A $CELERY_APP multi start $CELERYD_NODES \
+	--pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
 	--loglevel="${CELERYD_LOG_LEVEL}" $CELERYD_OPTS'
 ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait $CELERYD_NODES \
-	--pidfile=${CELERYD_PID_FILE}'
-ExecReload=/bin/sh -c '${CELERY_BIN} multi restart $CELERYD_NODES \
-	-A $CELERY_APP --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
+	--pidfile=${CELERYD_PID_FILE} --loglevel="${CELERYD_LOG_LEVEL}"'
+ExecReload=/bin/sh -c '${CELERY_BIN} -A $CELERY_APP multi restart $CELERYD_NODES \
+	--pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} \
 	--loglevel="${CELERYD_LOG_LEVEL}" $CELERYD_OPTS'
 Restart=always
 

diff --git a/extra/systemd/celerybeat.service b/extra/systemd/celerybeat.service
@@ -6,10 +6,10 @@ After=network.target
 Type=simple
 User=celery
 Group=celery
-EnvironmentFile=-/etc/conf.d/celery
+EnvironmentFile=/etc/conf.d/celery
 WorkingDirectory=/opt/celery
-ExecStart=/bin/sh -c '${CELERY_BIN} beat  \
-    -A ${CELERY_APP} --pidfile=${CELERYBEAT_PID_FILE} \
+ExecStart=/bin/sh -c '${CELERY_BIN} -A ${CELERY_APP} beat  \
+    --pidfile=${CELERYBEAT_PID_FILE} \
     --logfile=${CELERYBEAT_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL}'
 
 [Install]