fix: remove close listener on graceful end (#29)

glebec · May 31, 2018 · b831dfb · b831dfb
1 parent 43da253
commit b831dfb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/volleyball.js b/lib/volleyball.js
@@ -26,12 +26,16 @@ function Volleyball() {
       time: process.hrtime()
     };
     logReq(req, cycle);
-    res.on('finish', function () {
-      return logRes(res, cycle);
-    });
-    res.on('close', function () {
+
+    var handleUnexpectedClose = function handleUnexpectedClose() {
       return logClose(res, cycle);
+    };
+
+    res.on('finish', function () {
+      logRes(res, cycle);
+      res.removeListener('close', handleUnexpectedClose);
     });
+    res.on('close', handleUnexpectedClose);
     next();
   } // factory method which does not expose any of the library internals
 

diff --git a/src/volleyball.js b/src/volleyball.js
@@ -23,8 +23,13 @@ function Volleyball(config = {}) {
 		}
 
 		logReq(req, cycle)
-		res.on('finish', () => logRes(res, cycle))
-		res.on('close', () => logClose(res, cycle))
+
+		const handleUnexpectedClose = () => logClose(res, cycle)
+		res.on('finish', () => {
+			logRes(res, cycle)
+			res.removeListener('close', handleUnexpectedClose)
+		})
+		res.on('close', handleUnexpectedClose)
 
 		next()
 	}