Skip to content

Commit 174c63d

Browse files
SapphicCodeCommanderStormlouislam
authored
feat: structured logging (JSON) (louislam#5179)
Co-authored-by: Frank Elsinga <frank@elsinga.de> Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 parent b36a8b0 commit 174c63d

18 files changed

+99
-51
lines changed

server/auth.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const basicAuth = require("express-basic-auth");
22
const passwordHash = require("./password-hash");
33
const { R } = require("redbean-node");
4-
const { setting } = require("./util-server");
54
const { log } = require("../src/util");
65
const { loginRateLimiter, apiRateLimiter } = require("./rate-limiter");
76
const { Settings } = require("./settings");
@@ -137,7 +136,7 @@ exports.basicAuth = async function (req, res, next) {
137136
challenge: true,
138137
});
139138

140-
const disabledAuth = await setting("disableAuth");
139+
const disabledAuth = await Settings.get("disableAuth");
141140

142141
if (!disabledAuth) {
143142
middleware(req, res, next);

server/database.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,12 +598,12 @@ class Database {
598598
let title = await setting("title");
599599

600600
if (title) {
601-
console.log("Migrating Status Page");
601+
log.info("database", "Migrating Status Page");
602602

603603
let statusPageCheck = await R.findOne("status_page", " slug = 'default' ");
604604

605605
if (statusPageCheck !== null) {
606-
console.log("Migrating Status Page - Skip, default slug record is already existing");
606+
log.info("database", "Migrating Status Page - Skip, default slug record is already existing");
607607
return;
608608
}
609609

@@ -645,7 +645,7 @@ class Database {
645645
await setSetting("entryPage", "statusPage-default", "general");
646646
}
647647

648-
console.log("Migrating Status Page - Done");
648+
log.info("database", "Migrating Status Page - Done");
649649
}
650650
}
651651

server/notification-providers/alertnow.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
3-
const { setting } = require("../util-server");
43
const { getMonitorRelativeURL, UP, DOWN } = require("../../src/util");
4+
const { Settings } = require("../settings");
55

66
class AlertNow extends NotificationProvider {
77
name = "AlertNow";
@@ -29,7 +29,7 @@ class AlertNow extends NotificationProvider {
2929

3030
textMsg += ` - ${msg}`;
3131

32-
const baseURL = await setting("primaryBaseURL");
32+
const baseURL = await Settings.get("primaryBaseURL");
3333
if (baseURL && monitorJSON) {
3434
textMsg += ` >> ${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
3535
}

server/notification-providers/flashduty.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
33
const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
4-
const { setting } = require("../util-server");
4+
const { Settings } = require("../settings");
55
const successMessage = "Sent Successfully.";
66

77
class FlashDuty extends NotificationProvider {
@@ -93,7 +93,7 @@ class FlashDuty extends NotificationProvider {
9393
},
9494
};
9595

96-
const baseURL = await setting("primaryBaseURL");
96+
const baseURL = await Settings.get("primaryBaseURL");
9797
if (baseURL && monitorInfo) {
9898
options.client = "Uptime Kuma";
9999
options.client_url = baseURL + getMonitorRelativeURL(monitorInfo.id);

server/notification-providers/google-chat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
3-
const { setting } = require("../util-server");
43
const { getMonitorRelativeURL, UP } = require("../../src/util");
4+
const { Settings } = require("../settings");
55

66
class GoogleChat extends NotificationProvider {
77
name = "GoogleChat";
@@ -91,7 +91,7 @@ class GoogleChat extends NotificationProvider {
9191
}
9292

9393
// add button for monitor link if available
94-
const baseURL = await setting("primaryBaseURL");
94+
const baseURL = await Settings.get("primaryBaseURL");
9595
if (baseURL) {
9696
const urlPath = monitorJSON ? getMonitorRelativeURL(monitorJSON.id) : "/";
9797
sectionWidgets.push({

server/notification-providers/pagerduty.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
33
const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
4-
const { setting } = require("../util-server");
4+
const { Settings } = require("../settings");
55
let successMessage = "Sent Successfully.";
66

77
class PagerDuty extends NotificationProvider {
@@ -95,7 +95,7 @@ class PagerDuty extends NotificationProvider {
9595
},
9696
};
9797

98-
const baseURL = await setting("primaryBaseURL");
98+
const baseURL = await Settings.get("primaryBaseURL");
9999
if (baseURL && monitorInfo) {
100100
options.client = "Uptime Kuma";
101101
options.client_url = baseURL + getMonitorRelativeURL(monitorInfo.id);

server/notification-providers/pagertree.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
33
const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
4-
const { setting } = require("../util-server");
4+
const { Settings } = require("../settings");
55
let successMessage = "Sent Successfully.";
66

77
class PagerTree extends NotificationProvider {
@@ -79,7 +79,7 @@ class PagerTree extends NotificationProvider {
7979
},
8080
};
8181

82-
const baseURL = await setting("primaryBaseURL");
82+
const baseURL = await Settings.get("primaryBaseURL");
8383
if (baseURL && monitorJSON) {
8484
options.client = "Uptime Kuma";
8585
options.client_url = baseURL + getMonitorRelativeURL(monitorJSON.id);

server/notification-providers/rocket-chat.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
33
const Slack = require("./slack");
4-
const { setting } = require("../util-server");
54
const { getMonitorRelativeURL, DOWN } = require("../../src/util");
5+
const { Settings } = require("../settings");
66

77
class RocketChat extends NotificationProvider {
88
name = "rocket.chat";
@@ -50,7 +50,7 @@ class RocketChat extends NotificationProvider {
5050
await Slack.deprecateURL(notification.rocketbutton);
5151
}
5252

53-
const baseURL = await setting("primaryBaseURL");
53+
const baseURL = await Settings.get("primaryBaseURL");
5454

5555
if (baseURL) {
5656
data.attachments[0].title_link = baseURL + getMonitorRelativeURL(monitorJSON.id);

server/notification-providers/splunk.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
33
const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
4-
const { setting } = require("../util-server");
4+
const { Settings } = require("../settings");
55
let successMessage = "Sent Successfully.";
66

77
class Splunk extends NotificationProvider {
@@ -94,7 +94,7 @@ class Splunk extends NotificationProvider {
9494
},
9595
};
9696

97-
const baseURL = await setting("primaryBaseURL");
97+
const baseURL = await Settings.get("primaryBaseURL");
9898
if (baseURL && monitorInfo) {
9999
options.client = "Uptime Kuma";
100100
options.client_url = baseURL + getMonitorRelativeURL(monitorInfo.id);

server/notification-providers/stackfield.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const NotificationProvider = require("./notification-provider");
22
const axios = require("axios");
3-
const { setting } = require("../util-server");
43
const { getMonitorRelativeURL } = require("../../src/util");
4+
const { Settings } = require("../settings");
55

66
class Stackfield extends NotificationProvider {
77
name = "stackfield";
@@ -23,7 +23,7 @@ class Stackfield extends NotificationProvider {
2323

2424
textMsg += `\n${msg}`;
2525

26-
const baseURL = await setting("primaryBaseURL");
26+
const baseURL = await Settings.get("primaryBaseURL");
2727
if (baseURL) {
2828
textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
2929
}

0 commit comments

Comments
 (0)