Skip to content

Fix connections sticking around indefinitely #1853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/dev/vscode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1811,7 +1811,7 @@ index 0000000000..1166835371
+}
diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts
new file mode 100644
index 0000000000..23934687de
index 0000000000..36e80fb696
--- /dev/null
+++ b/src/vs/server/node/connection.ts
@@ -0,0 +1,157 @@
Expand Down Expand Up @@ -1878,7 +1878,7 @@ index 0000000000..23934687de
+ protected doDispose(): void {
+ this.protocol.sendDisconnect();
+ this.protocol.dispose();
+ this.protocol.getSocket().end();
+ this.protocol.getUnderlyingSocket().destroy();
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
Expand All @@ -1905,7 +1905,7 @@ index 0000000000..23934687de
+ if (this.process) {
+ this.process.kill();
+ }
+ this.protocol.getSocket().end();
+ this.protocol.getUnderlyingSocket().destroy();
+ }
+
+ protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
Expand Down