From 5d5d48a1aa9689e714f1c7a6e84da00c590b7108 Mon Sep 17 00:00:00 2001
From: riley <riley@tench.com>
Date: Tue, 12 Sep 2023 13:09:10 -0400
Subject: [PATCH] Fixed status polling for healthy container

---
 luasrc/view/btcpayserver/status.htm                | 2 +-
 root/usr/libexec/apps/btcpayserver/btcpayserver.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/luasrc/view/btcpayserver/status.htm b/luasrc/view/btcpayserver/status.htm
index 8dca7fd..54bdf90 100644
--- a/luasrc/view/btcpayserver/status.htm
+++ b/luasrc/view/btcpayserver/status.htm
@@ -1,7 +1,7 @@
 <%
 local util  = require "luci.util"
 local container_status = util.trim(util.exec("/usr/libexec/apps/btcpayserver/btcpayserver.sh status"))
-local container_running = string.find(string.lower(container_status), "up") and string.find(string.lower(container_status), "(healthy)")
+local container_running = string.match(string.lower(container_status), "^up .* (seconds|minutes|hours)")
 -%>
 
 <div class="cbi-value">
diff --git a/root/usr/libexec/apps/btcpayserver/btcpayserver.sh b/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
index d6114a8..bc1bad3 100755
--- a/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
+++ b/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
@@ -99,12 +99,12 @@ case "${ACTION}" in
     done
     ;;
   "status")
-    APP_NAME="btcpayserver"
-    CONTAINER_NAMES=$(docker ps -a --filter "name=${APP_NAME}" --format '{{.Names}}')
-    if [ -z "$CONTAINER_NAMES" ]; then
+    CONTAINER_NAME="generated_btcpayserver_1"
+    CONTAINER_STATUS=$(docker ps --all --filter "name=${CONTAINER_NAME}" --format '{{.Status}}' | awk -F' ' '{print $1, $2, $3}')
+    if [ -z "$CONTAINER_STATUS" ]; then
         echo "${APP_NAME} is not installed."
     else
-        docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Status}}'
+        echo "${CONTAINER_STATUS}"
     fi
     ;;
   "port")