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

prevent unexpected error throw from checkCertificate interrupt the beat

Browse Source
This commit is contained in:
LouisLam 2021-07-23 12:58:05 +08:00
parent 6b72d5033a
commit 48f82b55f8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/model/monitor.js
View File

@ -6,6 +6,7 @@ var timezone = require('dayjs/plugin/timezone')
dayjs.extend(utc)
dayjs.extend(timezone)
const axios = require("axios");
const {debug} = require("../util");
const {tcping, ping, checkCertificate} = require("../util-server");
const {R} = require("redbean-node");
const {BeanModel} = require("redbean-node/dist/bean-model");
@ -84,10 +85,18 @@ class Monitor extends BeanModel {
bean.ping = dayjs().valueOf() - startTime;
// Check certificate if https is used
let certInfoStartTime = dayjs().valueOf();
if (this.getUrl()?.protocol === "https:") {
await this.updateTlsInfo(checkCertificate(res));
try {
await this.updateTlsInfo(checkCertificate(res));
} catch (e) {
console.error(e.message)
}
}
debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms")
if (this.type === "http") {
bean.status = 1;
} else {
@ -178,7 +187,7 @@ class Monitor extends BeanModel {
clearInterval(this.heartbeatInterval)
}
// Helper Method:
// Helper Method:
// returns URL object for further usage
// returns null if url is invalid
getUrl() {
@ -199,7 +208,7 @@ class Monitor extends BeanModel {
tls_info_bean.monitor_id = this.id;
}
tls_info_bean.info_json = JSON.stringify(checkCertificateResult);
R.store(tls_info_bean);
await R.store(tls_info_bean);
}
static async sendStats(io, monitorID, userID) {

6
server/util.js
View File

@ -14,3 +14,9 @@ exports.ucfirst = function (str) {
return firstLetter.toUpperCase() + str.substr(1);
}
exports.debug = (msg) => {
if (process.env.NODE_ENV === "development") {
console.log(msg)
}
}