From 203a15b447e903b325c286fce5c68e45f9ef5ae9 Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Tue, 11 Jun 2024 00:31:53 +0000
Subject: [PATCH] cleanup pid file on start

---
 install.sh |  3 ++-
 update.sh  | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 2436561c..5f21e236 100644
--- a/install.sh
+++ b/install.sh
@@ -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]
@@ -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
 
diff --git a/update.sh b/update.sh
index c27eac73..b8dcf060 100644
--- a/update.sh
+++ b/update.sh
@@ -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