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

Merge branch '1.14.X'

Browse Source 
# Conflicts:
#	package.json
#	server/server.js
This commit is contained in:
Louis Lam
2022-04-19 16:43:13 +08:00
parent 9bf3b3a0f4 b782b25e17
commit 29d2d95c71
9 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/proxy.js
View File

@@ -3,7 +3,7 @@ const HttpProxyAgent = require("http-proxy-agent");
const HttpsProxyAgent = require("https-proxy-agent");
const SocksProxyAgent = require("socks-proxy-agent");
const { debug } = require("../src/util");
const server = require("./server");
const { UptimeKumaServer } = require("./uptime-kuma-server");
class Proxy {
@@ -151,6 +151,8 @@ class Proxy {
* @returns {Promise<void>}
*/
static async reloadProxy() {
const server = UptimeKumaServer.getInstance();
let updatedList = await R.getAssoc("SELECT id, proxy_id FROM monitor");
for (let monitorID in server.monitorList) {