wipppp

scality · May 13, 2024 · b00033d · b00033d
1 parent 15edfbf
commit b00033d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CountItems/masterProcess.js b/CountItems/masterProcess.js
@@ -43,10 +43,12 @@ const countMaster = new CountMaster({
 });
 
 metricServer.onRequest((req, res) => monitoring.metricsHandler(
-    countMaster.stop.bind(countMaster),
+    countMaster,
+    () => process.exit(1),
     req,
     res,
 ));
+
 const handleSignal = sig => countMaster.stop(sig, () => process.exit(0));
 process.on('SIGINT', handleSignal);
 process.on('SIGHUP', handleSignal);

diff --git a/utils/monitoring.js b/utils/monitoring.js
@@ -68,7 +68,7 @@ function _writeResponse(res, error) {
  * @param {http.ServerResponse} res - http response object
  * @return {void}
  */
-async function metricsHandler(onScraped, req, res) {
+async function metricsHandler(countMasterInstance, onScraped, req, res) {
     if (req.method !== 'GET' || req.url !== '/metrics') {
         return _writeResponse(res, errors.MethodNotAllowed);
     }
@@ -88,7 +88,7 @@ async function metricsHandler(onScraped, req, res) {
         return _writeResponse(res, errors.MethodNotAllowed);
     } finally {
         if (CountMaster.waitingForPromScraping === true) {
-            onScraped();
+            countMasterInstance.stop(null, onScraped);
         }
     }
 }