Regression: Prometheus was not being enable in some cases (#11249)

RocketChat · Jun 25, 2018 · de52e22 · de52e22
1 parent 80d8aed
commit de52e22
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/packages/rocketchat-lib/server/lib/metrics.js b/packages/rocketchat-lib/server/lib/metrics.js
@@ -144,15 +144,25 @@ app.use('/metrics', (req, res) => {
 const server = http.createServer(app);
 
 let timer;
-RocketChat.settings.get('Prometheus_Enabled', (key, value) => {
-	if (value === true) {
+const updatePrometheusConfig = () => {
+	const port = RocketChat.settings.get('Prometheus_Port');
+	const enabled = RocketChat.settings.get('Prometheus_Enabled');
+
+	if (port == null || enabled == null) {
+		return;
+	}
+
+	if (enabled === true) {
 		server.listen({
-			port: RocketChat.settings.get('Prometheus_Port'),
+			port,
 			host: process.env.BIND_IP || '0.0.0.0'
 		});
 		timer = Meteor.setInterval(setPrometheusData, 5000);
 	} else {
 		server.close();
 		Meteor.clearInterval(timer);
 	}
-});
+};
+
+RocketChat.settings.get('Prometheus_Enabled', updatePrometheusConfig);
+RocketChat.settings.get('Prometheus_Port', updatePrometheusConfig);