fix(polling): ensure socket is closed after v4 started event

TryGhost · Mar 1, 2021 · ee8f9e1 · ee8f9e1
1 parent 49f7a37
commit ee8f9e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/utils/port-polling.js b/lib/utils/port-polling.js
@@ -28,6 +28,8 @@ const useNetServer = options => new Promise((resolve, reject) => {
 
             if (useV4Boot && message.started) {
                 started = true;
+                socket.destroy();
+                ghostSocket = null;
                 return;
             }
 

diff --git a/test/unit/utils/port-polling-spec.js b/test/unit/utils/port-polling-spec.js
@@ -100,7 +100,7 @@ describe('Unit: Utils > portPolling', function () {
                 expect(netStub.listen.calledWithExactly({host: 'localhost', port: 1212})).to.be.true;
                 expect(netStub.close.callCount).to.eql(1);
 
-                expect(socketStub.destroy.callCount).to.eql(1);
+                expect(socketStub.destroy.callCount).to.eql(2);
                 expect(socketStub.on.callCount).to.eql(1);
             }).catch((err) => {
                 throw err;
@@ -188,7 +188,7 @@ describe('Unit: Utils > portPolling', function () {
                 expect(netStub.listen.calledWithExactly({host: 'localhost', port: 1212})).to.be.true;
                 expect(netStub.close.callCount).to.eql(1);
 
-                expect(socketStub.destroy.callCount).to.eql(1);
+                expect(socketStub.destroy.callCount).to.eql(2);
                 expect(socketStub.on.callCount).to.eql(1);
             });
         });