From b0d6b5b13d59de628eeb8820cfb3023d8501566a Mon Sep 17 00:00:00 2001 From: George Tsomlektsis Date: Mon, 3 Oct 2022 17:48:34 +0300 Subject: [PATCH] Fixed entry route not redirecting correctly when the status entry page changes slug. --- server/server.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/server.js b/server/server.js index 0c9a45e6c..0f215245c 100644 --- a/server/server.js +++ b/server/server.js @@ -155,7 +155,9 @@ let needSetup = false; Database.init(args); await initDatabase(testMode); - exports.entryPage = await setting("entryPage"); + const entryPage = (await getSettings("general"))["entryPage"]; + exports.entryPage = entryPage; + UptimeKumaServer.getInstance().entryPage = entryPage; await StatusPage.loadDomainMappingList(); log.info("server", "Adding route"); @@ -176,14 +178,15 @@ let needSetup = false; log.debug("entry", `Request Domain: ${hostname}`); + const uptimeKumaEntryPage=UptimeKumaServer.getInstance().entryPage; if (hostname in StatusPage.domainMappingList) { log.debug("entry", "This is a status page domain"); let slug = StatusPage.domainMappingList[hostname]; await StatusPage.handleStatusPageResponse(response, server.indexHTML, slug); - } else if (exports.entryPage && exports.entryPage.startsWith("statusPage-")) { - response.redirect("/status/" + exports.entryPage.replace("statusPage-", "")); + } else if (uptimeKumaEntryPage && uptimeKumaEntryPage.startsWith('statusPage-')) { + response.redirect("/status/" + uptimeKumaEntryPage.replace("statusPage-", "")); } else { response.redirect("/dashboard"); @@ -200,7 +203,7 @@ let needSetup = false; // Robots.txt app.get("/robots.txt", async (_request, response) => { let txt = "User-agent: *\nDisallow:"; - if (! await setting("searchEngineIndex")) { + if (!await setting("searchEngineIndex")) { txt += " /"; } response.setHeader("Content-Type", "text/plain"); @@ -1085,6 +1088,7 @@ let needSetup = false; await setSettings("general", data); exports.entryPage = data.entryPage; + UptimeKumaServer.getInstance().entryPage = data.entryPage; callback({ ok: true,