fix memory leak when stopping/starting several times.

bevacqua · Jun 1, 2016 · 1a1f679 · 1a1f679
1 parent cfc3b46
commit 1a1f679
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/monitor.js b/lib/monitor.js
@@ -86,7 +86,7 @@ internals.Monitor.prototype.start = function (callback) {
 
         var pmonitor = ProcessMonitor;
         var os = System;
-        var network = new Network.Monitor(self._server);
+        var network = self.network = new Network.Monitor(self._server);
 
         var asyncOps = {
             osload: os.loadavg,
@@ -193,6 +193,11 @@ internals.Monitor.prototype.stop = function () {
     this.removeListener('ops', state.opsHandler);
     Wreck.removeListener('response', state.wreckHandler);
 
+    if (this.network) {
+      this.network.stop();
+      this.network = null;
+    }
+
     internals.iterateOverEventHash(state.handlers, function (event, handler) {
 
         self._server.removeListener(event, handler);

diff --git a/lib/network.js b/lib/network.js
@@ -8,17 +8,27 @@ var Items = require('items');
 
 var internals = {};
 
+function noop () {
+}
 
 module.exports.Monitor = internals.NetworkMonitor = function (server) {
 
     this._requests = {};
     this._responseTimes = {};
     this._server = server;
 
-    this._server.on('request-internal', this._onRequest.bind(this));
-    this._server.on('response', this._onResponse.bind(this));
-};
+    var onReq = this._onRequest.bind(this);
+    var onRes = this._onResponse.bind(this);
+
+    this._server.on('request-internal', onReq);
+    this._server.on('response', onRes);
 
+    this.stop = function () {
+        this._server.removeListener('request-internal', onReq);
+        this._server.removeListener('response', onRes);
+        this.stop = noop;
+    };
+};
 
 internals.NetworkMonitor.prototype._onRequest = function (request, event, tags) {