Andrey/uptime-kuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Inline response saving logic

Browse Source
This commit is contained in:
codercms 2026-01-12 15:29:28 +03:00
parent beec1e4b1b
commit 3f241c2af3
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/model/monitor.js
View File

@ -642,7 +642,9 @@ class Monitor extends BeanModel {
bean.msg = `${res.status} - ${res.statusText}`;
bean.ping = dayjs().valueOf() - startTime;
this.saveResponseIfEnabled(bean, res.data, false);
if (this.getSaveResponse()) {
this.saveResponseData(bean, res.data);
}
// fallback for if kelog event is not emitted, but we may still have tlsInfo,
// e.g. if the connection is made through a proxy
@ -955,8 +957,8 @@ class Monitor extends BeanModel {
bean.msg = error.message;
}
if (error?.response?.data !== undefined) {
this.saveResponseIfEnabled(bean, error.response.data, true);
if (this.getSaveErrorResponse() && error?.response?.data !== undefined) {
this.saveResponseData(bean, error.response.data);
}
// If UP come in here, it must be upside down mode
@ -1150,21 +1152,6 @@ class Monitor extends BeanModel {
bean.response = responseData;
}
/**
* Conditionally save response body to a heartbeat based on monitor settings.
* @param {import("redbean-node").Bean} bean Heartbeat bean to populate.
* @param {unknown} data Response payload.
* @param {boolean} isError Whether the response is from an error path.
* @returns {void}
*/
saveResponseIfEnabled(bean, data, isError) {
if (isError ? !this.getSaveErrorResponse() : !this.getSaveResponse()) {
return;
}
this.saveResponseData(bean, data);
}
/**
* Make a request using axios
* @param {object} options Options for Axios

14
test/backend-test/test-monitor-response.js
View File

@ -31,18 +31,4 @@ describe("Monitor response saving", () => {
assert.strictEqual(bean.response, JSON.stringify({ ok: true }));
});
test("saveResponseIfEnabled only saves for errors when configured", () => {
const monitor = Object.create(Monitor.prototype);
monitor.save_response = 0;
monitor.save_error_response = 1;
monitor.response_max_length = 0;
const bean = {};
monitor.saveResponseIfEnabled(bean, "ok", false);
assert.strictEqual(bean.response, undefined);
monitor.saveResponseIfEnabled(bean, "fail", true);
assert.strictEqual(bean.response, "fail");
});
});