Merge branch 'main' into 319-flush-batching

FlowFuse · Feb 14, 2025 · 1fb1371 · 1fb1371
2 parents b4a4b05 + 3b93b2c
commit 1fb1371
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 84 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 2.14.0: Release
+
+ - Catch errors from prom-client (#316) @hardillb
+
 #### 2.13.0: Release
 
 

diff --git a/lib/resources/resourcePlugin.js b/lib/resources/resourcePlugin.js
@@ -11,8 +11,12 @@ module.exports = (RED) => {
             const register = new Registry()
             collectDefaultMetrics({ register })
             RED.httpAdmin.get('/ff/metrics', async function (req, res) {
-                const metrics = await register.metrics()
-                res.send(metrics)
+                try {
+                    const metrics = await register.metrics()
+                    res.send(metrics)
+                } catch (err) {
+                    res.status(500).send({ error: err.toString() })
+                }
             })
             RED.log.info('FlowFuse Metrics Plugin loaded')
         }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/nr-launcher",
-    "version": "2.13.0",
+    "version": "2.14.0",
     "description": "FlowFuse Launcher for running Node-RED",
     "exports": {
         "./auditLogger": "./lib/auditLogger/index.js",