Close WebSockets explicitly

Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Dec 20, 2017 · 3f38adc · 3f38adc
1 parent 482342b
commit 3f38adc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/tools/kompos/src/vm-connection.ts b/tools/kompos/src/vm-connection.ts
@@ -119,7 +119,17 @@ export class VmConnection {
   }
 
   public disconnect() {
-    console.assert(this.isConnected());
+    if (this.socket) {
+      try {
+        this.socket.terminate();
+      } catch (_) { }
+    }
+
+    if (this.traceDataSocket) {
+      try {
+        this.traceDataSocket.terminate();
+      } catch (_) { }
+    }
   }
 
   public requestProgramInfo() {

diff --git a/tools/kompos/tests/test-setup.ts b/tools/kompos/tests/test-setup.ts
@@ -155,17 +155,13 @@ export class TestConnection extends VmConnection {
   }
 
   public close(done: MochaDone) {
-    if (this.closed) {
-      done();
-      return;
+    if (!this.closed) {
+      this.closed = true;
+      this.disconnect();
+      this.somProc.kill();
     }
 
-    this.somProc.on("exit", _code => {
-      this.closed = true;
-      // wait until process is shut down, to make sure all ports are closed
-      done();
-    });
-    this.somProc.kill();
+    done();
   }
 }