cleanup pid file on start

This commit is contained in:
wh1te909 2024-06-11 00:31:53 +00:00
parent fe4dfe2194
commit 203a15b447
2 changed files with 30 additions and 1 deletions

View File

@ -855,7 +855,7 @@ echo "${celeryconf}" | sudo tee /etc/conf.d/celery.conf >/dev/null
celerybeatservice="$( celerybeatservice="$(
cat <<EOF cat <<EOF
[Unit] [Unit]
Description=Celery Beat Service V2 Description=Celery Beat Service V3
After=network.target redis-server.service postgresql.service After=network.target redis-server.service postgresql.service
[Service] [Service]
@ -865,6 +865,7 @@ Group=${USER}
EnvironmentFile=/etc/conf.d/celery.conf EnvironmentFile=/etc/conf.d/celery.conf
WorkingDirectory=/rmm/api/tacticalrmm WorkingDirectory=/rmm/api/tacticalrmm
ExecStart=/bin/sh -c '\${CELERY_BIN} -A \${CELERY_APP} beat --pidfile=\${CELERYBEAT_PID_FILE} --logfile=\${CELERYBEAT_LOG_FILE} --loglevel=\${CELERYD_LOG_LEVEL}' ExecStart=/bin/sh -c '\${CELERY_BIN} -A \${CELERY_APP} beat --pidfile=\${CELERYBEAT_PID_FILE} --logfile=\${CELERYBEAT_LOG_FILE} --loglevel=\${CELERYD_LOG_LEVEL}'
ExecStartPre=rm -f /rmm/api/tacticalrmm/beat.pid
Restart=always Restart=always
RestartSec=10s RestartSec=10s

View File

@ -115,6 +115,34 @@ for i in nginx nats-api nats rmm daphne; do
sudo systemctl stop ${i} sudo systemctl stop ${i}
done done
if ! grep -q V3 /etc/systemd/system/celerybeat.service; then
sudo rm -f /etc/systemd/system/celerybeat.service
celerybeatservice="$(
cat <<EOF
[Unit]
Description=Celery Beat Service V3
After=network.target redis-server.service postgresql.service
[Service]
Type=simple
User=${USER}
Group=${USER}
EnvironmentFile=/etc/conf.d/celery.conf
WorkingDirectory=/rmm/api/tacticalrmm
ExecStart=/bin/sh -c '\${CELERY_BIN} -A \${CELERY_APP} beat --pidfile=\${CELERYBEAT_PID_FILE} --logfile=\${CELERYBEAT_LOG_FILE} --loglevel=\${CELERYD_LOG_LEVEL}'
ExecStartPre=rm -f /rmm/api/tacticalrmm/beat.pid
Restart=always
RestartSec=10s
[Install]
WantedBy=multi-user.target
EOF
)"
echo "${celerybeatservice}" | sudo tee /etc/systemd/system/celerybeat.service >/dev/null
sudo systemctl daemon-reload
fi
# migrate daphne to uvicorn # migrate daphne to uvicorn
if ! grep -q uvicorn /etc/systemd/system/daphne.service; then if ! grep -q uvicorn /etc/systemd/system/daphne.service; then
sudo rm -f /etc/systemd/system/daphne.service sudo rm -f /etc/systemd/system/daphne.service