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

Revert "feat: structured logging (JSON)" (#5175)

Browse source
This commit is contained in:
Louis Lam 2024-10-09 07:43:44 +08:00 • committed by GitHub
parent 4829ad8c5d
commit eca90a2b00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 239 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

19
server/socket-handlers/cloudflared-socket-handler.js
View file

@ -1,8 +1,7 @@
const { checkLogin, doubleCheckPassword } = require("../util-server");
const { checkLogin, setSetting, setting, doubleCheckPassword } = require("../util-server");
const { CloudflaredTunnel } = require("node-cloudflared-tunnel");
const { UptimeKumaServer } = require("../uptime-kuma-server");
const { log } = require("../../src/util");
const { Settings } = require("../settings");
const io = UptimeKumaServer.getInstance().io;
const prefix = "cloudflared_";
@ -41,7 +40,7 @@ module.exports.cloudflaredSocketHandler = (socket) => {
socket.join("cloudflared");
io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
io.to(socket.userID).emit(prefix + "running", cloudflared.running);
io.to(socket.userID).emit(prefix + "token", await Settings.get("cloudflaredTunnelToken"));
io.to(socket.userID).emit(prefix + "token", await setting("cloudflaredTunnelToken"));
} catch (error) { }
});
@ -56,7 +55,7 @@ module.exports.cloudflaredSocketHandler = (socket) => {
try {
checkLogin(socket);
if (token && typeof token === "string") {
await Settings.set("cloudflaredTunnelToken", token);
await setSetting("cloudflaredTunnelToken", token);
cloudflared.token = token;
} else {
cloudflared.token = null;
@ -68,7 +67,7 @@ module.exports.cloudflaredSocketHandler = (socket) => {
socket.on(prefix + "stop", async (currentPassword, callback) => {
try {
checkLogin(socket);
const disabledAuth = await Settings.get("disableAuth");
const disabledAuth = await setting("disableAuth");
if (!disabledAuth) {
await doubleCheckPassword(socket, currentPassword);
}
@ -84,7 +83,7 @@ module.exports.cloudflaredSocketHandler = (socket) => {
socket.on(prefix + "removeToken", async () => {
try {
checkLogin(socket);
await Settings.set("cloudflaredTunnelToken", "");
await setSetting("cloudflaredTunnelToken", "");
} catch (error) { }
});
@ -97,15 +96,15 @@ module.exports.cloudflaredSocketHandler = (socket) => {
*/
module.exports.autoStart = async (token) => {
if (!token) {
token = await Settings.get("cloudflaredTunnelToken");
token = await setting("cloudflaredTunnelToken");
} else {
// Override the current token via args or env var
await Settings.set("cloudflaredTunnelToken", token);
log.info("cloudflare", "Use cloudflared token from args or env var");
await setSetting("cloudflaredTunnelToken", token);
console.log("Use cloudflared token from args or env var");
}
if (token) {
log.info("cloudflare", "Start cloudflared");
console.log("Start cloudflared");
cloudflared.token = token;
cloudflared.start();
}