Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-07-24 07:21:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2

Browse source 
# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
This commit is contained in:
Louis Lam 2023-11-25 03:25:03 +08:00
commit e9bf02fc2c
10 changed files with 119 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/util-server.js
View file

@ -461,6 +461,7 @@ exports.postgresQuery = function (connectionString, query) {
});
} catch (e) {
reject(e);
client.end();
}
}
});
@ -1154,7 +1155,6 @@ module.exports.axiosAbortSignal = (timeoutMs) => {
// v16-: AbortSignal.timeout is not supported
try {
const abortController = new AbortController();
setTimeout(() => abortController.abort(), timeoutMs);
return abortController.signal;