#58

CHANGELOG.md

@@ -1,7 +1,8 @@
 
 # 0.5.6
 
-- Don't mess with incoming error #37
+- [#58] Clear all intervals when receiving kill signal from PM2 to free event loop
+- [#37] Don't mess with incoming error
 - right pmx version injected into module
 - if pmx cannot find package.json in current folder, try to require in parent folder
 - disable some error messages

lib/Probe.js

@@ -123,6 +123,19 @@ Probe.probe = function() {
       });
       checkIssues(Probe._var);
     }, 990);
+
+    // Clear probes data cooking on SIGINT (first PM2 signal when killing);
+    process.on('SIGINT', function stopProbeInterval() {
+      clearInterval(p_interval);
+
+      // == 1 because there is also a set interval in probes/pacemaker.js
+      if (process.listeners('SIGINT').filter(function (listener) {
+        return listener !== stopProbeInterval;
+      }).length == 1) {
+        process.exit(0);
+      }
+    });
+
   }
 
   return {

lib/probes/pacemaker.js

@@ -10,10 +10,16 @@ module.exports = function(pmx) {
     unit        : 'ms'
   });
 
-  setInterval(function() {
+  var pace_interval = setInterval(function() {
     var newTime = process.hrtime();
     var delay = (newTime[0] - oldTime[0]) * 1e3 + (newTime[1] - oldTime[1]) / 1e6 - TIME_INTERVAL;
     oldTime = newTime;
     histogram.update(delay);
   }, TIME_INTERVAL);
+
+  // Clear pacemaker interval cooking on SIGINT (first PM2 signal when killing);
+  process.on('SIGINT', function stopIntervalSIGINT() {
+    clearInterval(pace_interval);
+  });
+
 };