diff --git a/root/app/swagUptimeKuma.py b/root/app/swagUptimeKuma.py index 2b41180..f1a77bf 100644 --- a/root/app/swagUptimeKuma.py +++ b/root/app/swagUptimeKuma.py @@ -99,7 +99,7 @@ class SwagUptimeKuma: self._api.delete_monitor(monitorData['id']) def deleteMonitors(self, containerNames): - print(f"{logPrefix} Deleting all monitors that had their containers removed") + print(f"{logPrefix} Deleting all monitors that had their containers removed or were disabled") if (containerNames): for containerName in containerNames: self.deleteMonitor(containerName) @@ -152,7 +152,7 @@ class SwagUptimeKuma: def getMonitorSwagTagValue(self, monitorData): """ - This value is container name itself. Used to link containers with monitors + This value is container name itself. Used to link containers with monitors. """ for tag in monitorData.get('tags'): if (has_key_with_value(tag, "name", self.swagTagName)): diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-add-package/run index f864d7f..af3a661 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-add-package/run @@ -1,12 +1,12 @@ #!/usr/bin/with-contenv bash -echo "[mod-swag-auto-uptime-kuma] Installing SWAG auto-uptime-kuma packages" +echo "[mod-auto-uptime-kuma] Installing SWAG auto-uptime-kuma packages" if ! pip list 2>&1 | grep -q "uptime-kuma-api\|docker"; then echo "\ docker \ uptime-kuma-api" >> /mod-pip-packages-to-install.list - echo "[mod-swag-auto-uptime-kuma] Successfuly installed packages" + echo "[mod-auto-uptime-kuma] Successfuly installed packages" else - echo "[mod-swag-auto-uptime-kuma] Packages already installed, skipping..." + echo "[mod-auto-uptime-kuma] Packages already installed, skipping..." fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-install/run index ab0bf7e..a55c9e6 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-install/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-uptime-kuma-install/run @@ -1,11 +1,11 @@ #!/usr/bin/with-contenv bash if [ -z "$UPTIME_KUMA_URL" ] || [ -z "$UPTIME_KUMA_USERNAME" ] || [ -z "$UPTIME_KUMA_PASSWORD" ]; then - echo "[mod-swag-auto-uptime-kuma] Missing required environment variables. Please refer to the Readme, skipping..." + echo "[mod-auto-uptime-kuma] Missing required environment variables. Please refer to the Readme, skipping..." exit 0 fi -echo "[mod-swag-auto-uptime-kuma] Executing SWAG auto-uptime-kuma mod" +echo "[mod-auto-uptime-kuma] Executing SWAG auto-uptime-kuma mod" scriptPath='/app/auto-uptime-kuma.py'