Merge branch '1.23.X' into merge

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Louis Lam
2024-01-03 02:10:01 +08:00
3 changed files with 6 additions and 3 deletions

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()}`);