a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1853 from cdr/fix-heartbeat 

Fix connections sticking around indefinitely
This commit is contained in:
Asher 2020-06-30 17:43:36 -05:00 committed by GitHub
parent a942531079 ebef18d626
commit 9ff0e455c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/dev/vscode.patch
View File

@ -1811,7 +1811,7 @@ index 0000000000..1166835371
+} +}
diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts
new file mode 100644 new file mode 100644
index 0000000000..23934687de index 0000000000..36e80fb696
--- /dev/null --- /dev/null
+++ b/src/vs/server/node/connection.ts +++ b/src/vs/server/node/connection.ts
@@ -0,0 +1,157 @@ @@ -0,0 +1,157 @@
@ -1878,7 +1878,7 @@ index 0000000000..23934687de
+ protected doDispose(): void { + protected doDispose(): void {
+ this.protocol.sendDisconnect(); + this.protocol.sendDisconnect();
+ this.protocol.dispose(); + this.protocol.dispose();
+ this.protocol.getSocket().end(); + this.protocol.getUnderlyingSocket().destroy();
+ } + }
+ +
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void { + protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
@ -1905,7 +1905,7 @@ index 0000000000..23934687de
+ if (this.process) { + if (this.process) {
+ this.process.kill(); + this.process.kill();
+ } + }
+ this.protocol.getSocket().end(); + this.protocol.getUnderlyingSocket().destroy();
+ } + }
+ +
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void { + protected doReconnect(socket: ISocket, buffer: VSBuffer): void {