Skip to content

Treat connection close during stop() as handled #1782

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.

Sign up for GitHub

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

Open
lionel- wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −1
Open

Treat connection close during stop() as handled #1782

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion client/src/common/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,8 +1832,11 @@ export abstract class BaseLanguageClient implements FeatureClient<Middleware, La
}
}
this._connection = undefined;
// `Stopping` counts as handled. The application asked for the close via `stop()`,
// and `closed()` was skipped above so the handler had no chance to set `handled`.
const handled = this.$state === ClientState.Stopping || handlerResult.handled === true;
if (handlerResult.action === CloseAction.DoNotRestart) {
this.error(handlerResult.message ?? 'Connection to server got closed. Server will not be restarted.', undefined, handlerResult.handled === true ? false : 'force');
this.error(handlerResult.message ?? 'Connection to server got closed. Server will not be restarted.', undefined, handled ? false : 'force');
this.cleanUp(ShutdownMode.Stop);
if (this.$state === ClientState.Starting) {
this.$state = ClientState.StartFailed;
Expand Down