Skip to content

Commit

Permalink
cleanup pid file on start
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Jun 11, 2024
1 parent fe4dfe2 commit 203a15b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
3 changes: 2 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ echo "${celeryconf}" | sudo tee /etc/conf.d/celery.conf >/dev/null
celerybeatservice="$(
cat <<EOF
[Unit]
Description=Celery Beat Service V2
Description=Celery Beat Service V3
After=network.target redis-server.service postgresql.service
[Service]
Expand All @@ -865,6 +865,7 @@ 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
Expand Down
28 changes: 28 additions & 0 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,34 @@ for i in nginx nats-api nats rmm daphne; do
sudo systemctl stop ${i}
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
if ! grep -q uvicorn /etc/systemd/system/daphne.service; then
sudo rm -f /etc/systemd/system/daphne.service
Expand Down

0 comments on commit 203a15b

Please sign in to comment.