7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-08 15:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.23.X' into merge

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Louis Lam
2024-01-03 02:10:01 +08:00
parent d7d57eafe3 f1e2ee74ea
commit 2a315d4c84
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/monitor-types/tailscale-ping.js
View File

@@ -38,7 +38,8 @@ class TailscalePing extends MonitorType {
async runTailscalePing(hostname, interval) {
let timeout = interval * 1000 * 0.8;
let res = await childProcessAsync.spawn("tailscale", [ "ping", "--c", "1", hostname ], {
timeout: timeout
timeout: timeout,
encoding: "utf8",
});
if (res.stderr && res.stderr.toString()) {
throw new Error(`Error in output: ${res.stderr.toString()}`);

4
server/notification-providers/apprise.js
View File

@@ -14,7 +14,9 @@ class Apprise extends NotificationProvider {
args.push("-t");
args.push(notification.title);
}
const s = await childProcessAsync.spawn("apprise", args);
const s = await childProcessAsync.spawn("apprise", args, {
encoding: "utf8",
});
const output = (s.stdout) ? s.stdout.toString() : "ERROR: maybe apprise not found";