Merge 02af171ec9 into d2f71d11d6

Update API URL to compatible with the latest version of ServerChan (#5227 )
Fix #2946 - allow push monitors to update prometheus
2024-11-27 08:44:04 +00:00 · 2024-10-22 08:49:02 +00:00 · 2024-10-22 10:48:51 +02:00 · 2024-01-03 13:17:34 -08:00
2 changed files with 7 additions and 2 deletions
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -645,6 +645,10 @@ class Monitor extends BeanModel {
                            retries = 0;
                            log.debug("monitor", `[${this.name}] timeout = ${timeout}`);
                            this.heartbeatInterval = setTimeout(safeBeat, timeout);
+
+                            bean.status = UP;
+                            this.prometheus?.update(bean, tlsInfo);
+
                            return;
                        }
                    } else {
--- a/server/notification-providers/serverchan.js
+++ b/server/notification-providers/serverchan.js
@ -12,8 +12,9 @@ class ServerChan extends NotificationProvider {
        const okMsg = "Sent Successfully.";

        // serverchan3 requires sending via ft07.com
-        const url = String(notification.serverChanSendKey).startsWith("sctp")
-            ? `https://${notification.serverChanSendKey}.push.ft07.com/send`
+        const matchResult = String(notification.serverChanSendKey).match(/^sctp(\d+)t/i);
+        const url = matchResult && matchResult[1]
+            ? `https://${matchResult[1]}.push.ft07.com/send/${notification.serverChanSendKey}.send`
            : `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`;

        try {
Author	SHA1	Message	Date
John W Higgins	975c23a5ec	Merge `02af171ec9` into `d2f71d11d6`	2024-10-22 08:49:02 +00:00
Easy	d2f71d11d6	Update API URL to compatible with the latest version of ServerChan (#5227 ) Some checks are pending Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions Details Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run Details Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run Details Auto Test / check-linters (push) Waiting to run Details Auto Test / e2e-test (push) Waiting to run Details CodeQL / Analyze (push) Waiting to run Details Merge Conflict Labeler / Labeling (push) Waiting to run Details json-yaml-validate / json-yaml-validate (push) Waiting to run Details	2024-10-22 10:48:51 +02:00
John W Higgins	02af171ec9	Fix #2946 - allow push monitors to update prometheus	2024-01-03 13:17:34 -08:00