systemd/celery worker fixes

Author: tedivm

provisioning/etc/gitconsensus/celery

@@ -10,7 +10,6 @@ CELERYD_NODES="w1"
 
 # Absolute or relative path to the 'celery' command:
 CELERY_BIN="/opt/gitconsensus/venv/bin/celery"
-#CELERY_BIN="/virtualenvs/def/bin/celery"
 
 # App instance to use
 # comment out this line if you don't use an app
@@ -27,6 +26,6 @@ CELERYD_OPTS="--time-limit=120 --concurrency=4"
 # - %n will be replaced with the first part of the nodename.
 # - %I will be replaced with the current child process index
 #   and is important when using the prefork pool to avoid race conditions.
-CELERYD_PID_FILE="/var/run/celery/%n.pid"
-CELERYD_LOG_FILE="/var/log/celery/%n%I.log"
+CELERYD_PID_FILE="/var/run/gitconsensus/worker-%n.pid"
+CELERYD_LOG_FILE="/var/log/gitconsensus/worker-%n%I.log"
 CELERYD_LOG_LEVEL="INFO"

provisioning/etc/systemd/system/gitconsensusworker.service

@@ -8,9 +8,9 @@ User=gitconsensus
 Group=gitconsensus
 EnvironmentFile=-/etc/gitconsensus/celery
 WorkingDirectory=${CELERY_HOME}
-ExecStart=/bin/sh -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi start ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
-ExecStop=/bin/sh -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
-ExecReload=/bin/sh -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi restart ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
+ExecStart=/bin/bash -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi start ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
+ExecStop=/bin/bash -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi stopwait ${CELERYD_NODES} --pidfile=${CELERYD_PID_FILE}'
+ExecReload=/bin/bash -c 'source ${CELERY_HOME}/bin/envvar && ${CELERY_BIN} multi restart ${CELERYD_NODES} -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
 
 [Install]
 WantedBy=multi-user.target

provisioning/setup.sh

@@ -15,6 +15,12 @@ cp $DIR/etc/gitconsensus/celery /etc/gitconsensus/celery
 
 adduser --gecos "" --disabled-login gitconsensus
 
+mkdir /var/run/gitconsensus
+chown gitconsensus:gitconsensus /var/run/gitconsensus
+mkdir /var/log/gitconsensus
+chown gitconsensus:gitconsensus /var/log/gitconsensus
+
 echo "d /var/run/celery 0755 celery celery -" >> /etc/tmpfiles.d/celery.conf
 echo "d /var/log/celery 0755 celery celery - " >> /etc/tmpfiles.d/celery.conf
 
+systemctl daemon-reload