7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-09 12:21:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into karelkryda_master

Browse Source 
# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js
This commit is contained in:
Louis Lam
2022-10-09 19:26:00 +08:00
parent 204339fbed 07f9aafd7b
commit b007681e67
65 changed files with 1443 additions and 2112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/model/monitor.js
View File

@@ -13,6 +13,7 @@ const version = require("../../package.json").version;
const apicache = require("../modules/apicache");
const { UptimeKumaServer } = require("../uptime-kuma-server");
const { CacheableDnsHttpAgent } = require("../cacheable-dns-http-agent");
const { DockerHost } = require("../docker");
const Maintenance = require("./maintenance");
/**
@@ -501,7 +502,7 @@ class Monitor extends BeanModel {
if (dockerHost._dockerType === "socket") {
options.socketPath = dockerHost._dockerDaemon;
} else if (dockerHost._dockerType === "tcp") {
options.baseURL = dockerHost._dockerDaemon;
options.baseURL = DockerHost.patchDockerURL(dockerHost._dockerDaemon);
}
log.debug(`[${this.name}] Axios Request`);