mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'chakflying/tls-expiry' into tls-expiry 

# Conflicts:
#	server/model/monitor.js
#	src/pages/Details.vue
This commit is contained in:
LouisLam 2021-07-26 22:56:17 +08:00
parent bf3e9dccd2 caec933186
commit ac3732f6cc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/model/monitor.js
View File

@ -6,8 +6,7 @@ var timezone = require('dayjs/plugin/timezone')
dayjs.extend(utc)
dayjs.extend(timezone)
const axios = require("axios");
const {UP, DOWN, PENDING} = require("../util");
const {debug} = require("../util");
const {debug, UP, DOWN, PENDING} = require("../util");
const {tcping, ping, checkCertificate} = require("../util-server");
const {R} = require("redbean-node");
const {BeanModel} = require("redbean-node/dist/bean-model");