Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-01 05:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should be an ulitmate fix for request timeout issue (#4011)

Browse Source
This commit is contained in:
Louis Lam 2023-11-12 13:50:51 +08:00 committed by GitHub
parent 0608881954
commit 6e80c850f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/model/monitor.js
View File

@ -367,6 +367,12 @@ class Monitor extends BeanModel {
bean.duration = 0; bean.duration = 0;
} }
// Runtime patch timeout if it is 0
// See https://github.com/louislam/uptime-kuma/pull/3961#issuecomment-1804149144
if (this.timeout <= 0) {
this.timeout = this.interval * 1000 * 0.8;
}
try { try {
if (await Monitor.isUnderMaintenance(this.id)) { if (await Monitor.isUnderMaintenance(this.id)) {
bean.msg = "Monitor under maintenance"; bean.msg = "Monitor under maintenance";

6
server/util-server.js
View File

@ -1132,13 +1132,17 @@ if (process.env.TEST_BACKEND) {
*/ */
module.exports.axiosAbortSignal = (timeoutMs) => { module.exports.axiosAbortSignal = (timeoutMs) => {
try { try {
// Just in case, as 0 timeout here will cause the request to be aborted immediately
if (!timeoutMs || timeoutMs <= 0) {
timeoutMs = 5000;
}
return AbortSignal.timeout(timeoutMs); return AbortSignal.timeout(timeoutMs);
} catch (_) { } catch (_) {
// v16-: AbortSignal.timeout is not supported // v16-: AbortSignal.timeout is not supported
try { try {
const abortController = new AbortController(); const abortController = new AbortController();
setTimeout(() => abortController.abort(), timeoutMs || 0); setTimeout(() => abortController.abort(), timeoutMs);
return abortController.signal; return abortController.signal;
} catch (_) { } catch (_) {