Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-05-02 06:26:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'louislam:master' into master

Browse source
This commit is contained in:
Moritz R 2022-04-13 15:58:17 +02:00 • committed by GitHub
commit 361e44ad6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 1168 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/model/monitor.js
View file

@ -74,6 +74,7 @@ class Monitor extends BeanModel {
interval: this.interval,
retryInterval: this.retryInterval,
keyword: this.keyword,
expiryNotification: this.isEnabledExpiryNotification(),
ignoreTls: this.getIgnoreTls(),
upsideDown: this.isUpsideDown(),
maxredirects: this.maxredirects,
@ -104,6 +105,10 @@ class Monitor extends BeanModel {
return Buffer.from(user + ":" + pass).toString("base64");
}
isEnabledExpiryNotification() {
return Boolean(this.expiryNotification);
}
/**
* Parse to boolean
* @returns {boolean}
@ -243,7 +248,7 @@ class Monitor extends BeanModel {
let tlsInfoObject = checkCertificate(res);
tlsInfo = await this.updateTlsInfo(tlsInfoObject);
if (!this.getIgnoreTls()) {
if (!this.getIgnoreTls() && this.isEnabledExpiryNotification()) {
debug(`[${this.name}] call sendCertNotification`);
await this.sendCertNotification(tlsInfoObject);
}