Fix stop of socket server
#33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tortmayr
requested changes
Dec 21, 2022
| import { createAppModule } from '../di/app-module'; | ||
| import { defaultSocketLaunchOptions } from './socket-cli-parser'; | ||
| import { SocketServerLauncher } from './socket-server-launcher'; | ||
| describe('test createCliParser', () => { |
There was a problem hiding this comment.
Suggested change
| describe('test createCliParser', () => { | |
| describe('test SocketServerLauncher', () => { |
| const appContainer = new Container(); | ||
| appContainer.load(createAppModule(defaultSocketLaunchOptions)); | ||
| const launcher = appContainer.resolve(SocketServerLauncher); | ||
| launcher.start({ port: 5007 }); |
There was a problem hiding this comment.
Maybe we should use a different port here. Just to avoid failing tests if the workflow example server is currently running as well.
| @@ -29,13 +29,14 @@ export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnec | |||
|
|
|||
| protected currentConnections: jsonrpc.MessageConnection[] = []; | |||
| protected startupCompleteMessage = START_UP_COMPLETE_MSG; | |||
| private netServer: net.Server; | |||
There was a problem hiding this comment.
Suggested change
| private netServer: net.Server; | |
| protected netServer: net.Server; |
The socket server currently does not actually shutdown the server when calling shutdown. In order to do so, the `close` method must be called on the server. Thus the server was moved into a private member to be able to call `close` on `stop`. This also fixes the test launch configs and adds a test. Furthermore the overriden methods in SocketServerLauncher are not public anymore in order to have a clean api. Contributed on behalf of STMicroelectronics.
eneufeld
force-pushed
the
pr/fix-server-shutdown
branch
from
bccb77b to
cf39942
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The socket server currently does not actually shutdown the server when calling shutdown.
In order to do so, the
closemethod must be called on the server. Thus the server was moved into a private memberto be able to call
closeonstop.This also fixes the test launch config and adds a test. Furthermore the overriden methods in SocketServerLauncher are not public anymore in order to have a clean api.
Contributed on behalf of STMicroelectronics.