Handle errors gathering metrics from slaves

If the session to a slave is lost while gathering metrics the error
would propagate out to the metrics route handler and break collection of
statistics.  Fix by handling errors thrown from sending the getMetrics
request to slaves.
This commit is contained in:
Hornwitser committed 2021-09-28 21:32:29 +02:00
1 parent bfec83996a
commit 3b6ebeb653
1 file changed
+10 -1
+10 -1
View File
@@ -8,6 +8,7 @@ const jwt = require("jsonwebtoken");
const path = require("path"); const path = require("path");
const util = require("util"); const util = require("util");
const libErrors = require("@clusterio/lib/errors");
const libHelpers = require("@clusterio/lib/helpers"); const libHelpers = require("@clusterio/lib/helpers");
const libLink = require("@clusterio/lib/link"); const libLink = require("@clusterio/lib/link");
const libPlugin = require("@clusterio/lib/plugin"); const libPlugin = require("@clusterio/lib/plugin");
@@ -47,7 +48,15 @@ async function getMetrics(req, res, next) {
let requests = []; let requests = [];
let timeout = req.app.locals.master.config.get("master.metrics_timeout") * 1000; let timeout = req.app.locals.master.config.get("master.metrics_timeout") * 1000;
for (let slaveConnection of req.app.locals.master.wsServer.slaveConnections.values()) { for (let slaveConnection of req.app.locals.master.wsServer.slaveConnections.values()) {
requests.push(libHelpers.timeout(libLink.messages.getMetrics.send(slaveConnection), timeout, null)); requests.push(libHelpers.timeout(
libLink.messages.getMetrics.send(slaveConnection).catch(err => {
if (!(err instanceof libErrors.SessionLost)) {
logger.error(`Unexpected error gathering metrics from slave:\n${err.stack}`);
}
return null;
}),
timeout, null
));
} }
for await (let result of await libPrometheus.defaultRegistry.collect()) { for await (let result of await libPrometheus.defaultRegistry.collect()) {