run metrics on other port

Author: AlexandreDewilde

src/app.js

@@ -16,7 +16,6 @@ const index = require('./routes/index');
 const editor = require('./routes/editor');
 const legal = require('./routes/legal');
 const config = require('./config/config');
-const promBundle = require("express-prom-bundle");
 
 const app = express();
 app.disable("x-powered-by");
@@ -40,14 +39,6 @@ else {
 }
 app.use(minify({ jsMatch: false }));
 
-// Prometheus middleware
-// TODO new middleware
-if(config.METRICS){
-    app.use(promBundle({
-        includeMethod: true,
-        includePath: true,
-    }));
-}
 
 //app.use(secure);
 app.use(express.json());

src/config/config dist.json

@@ -16,5 +16,6 @@
         "DB_DATABASE": "codewe",
         "DB_PORT": "3306"
     },
-    "METRICS": false
+    "METRICS": false,
+    "METRICS_PORT": 8000
 }

src/metricsApp.js

@@ -0,0 +1,16 @@
+const express = require("express");
+const promBundle = require("express-prom-bundle");
+
+const promMetrics = promBundle({
+    includeMethod: true,
+    includePath: true,
+    autoregister: false
+});
+
+const { promClient, metricsMiddleware } = promMetrics;
+
+const metricsApp = express();
+metricsApp.disable("x-powered-by");
+metricsApp.use(metricsMiddleware);
+
+module.exports = { metricsMiddleware, metricsApp };

src/server.js

@@ -23,7 +23,14 @@ const options = ssl ? {
 } : null;
 
 const app = require('./app');
-const server = ssl ? require('https').createServer(options, app) : require('http').createServer(app);
+const config = require('./config/config');
+
+const http = ssl ? require('https') : require('http');
+const server = http.createServer(options, app);
+if (configs.METRICS) {
+    const {metricsApp} = require('./metricsApp');
+    var metricsServer = http.createServer(metricsApp);
+}
 
 // config websockets
 const wss = new WebSocket.Server({ server });
@@ -34,3 +41,7 @@ require('./socket/socket')(wss);
 server.listen(port, host, () => {
     console.log('Server Started!');
 });
+
+if (config.METRICS) {
+    metricsServer.listen(config.METRICS_PORT);
+}

src/socket/socket.js

@@ -26,7 +26,6 @@ const rooms = {};
 const hook = config.DISCORD_WEBHOOK ? new discordWebhook.Webhook(config.DISCORD_WEBHOOK) : null;
 
 module.exports = function (wss) {
-	// TODO catch error handle disconnection etc
 	// Based on https://stackoverflow.com/a/62867363
   	wss.on('connection', socket => {
   		prom.connexions.inc();