CHE-3216: Fix kill terminal process and its children on closing terminal. #3395
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
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1324/ |
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1384/ |
garagatyi
suggested changes
Dec 23, 2016
| @@ -215,13 +215,12 @@ public void onError() { | |||
| } | |||
|
|
|||
| /** | |||
| * Sends 'exit' command on server side to stop terminal. | |||
| * Sends 'kill' command on server side to stop terminal. | |||
| */ | ||
| public void stopTerminal() { | ||
| if (connected) { | ||
| Jso jso = Jso.create(); | ||
| jso.addField("type", "data"); | ||
| jso.addField("data", "exit\n"); | ||
| jso.addField("type", "kill"); |
| if !finalizer.fileClosed { | ||
| file.Close() | ||
| finalizer.fileClosed = true | ||
| fmt.Println("Pty file closed.") |
| @@ -141,6 +159,10 @@ func sendConnectionInputToPty(conn *websocket.Conn, reader io.ReadCloser, f *os. | |||
| log.Printf("Invalid message %s\n", err) | |||
| continue | |||
| } | |||
| if msg.Type == "kill" { | |||
| @@ -141,6 +159,10 @@ func sendConnectionInputToPty(conn *websocket.Conn, reader io.ReadCloser, f *os. | |||
| log.Printf("Invalid message %s\n", err) | |||
| continue | |||
| } | |||
| if msg.Type == "kill" { | |||
| wp.Stop(finalizer); | |||
| ) | ||
|
|
||
| type wsPty struct { | ||
| Cmd *exec.Cmd // pty builds on os.exec | ||
| PtyFile *os.File // a pty is simply an os.File | ||
| } | ||
|
|
||
| func (wp *wsPty) Stop(finalizer *ReadWriteRoutingFinalizer) { | ||
| closeFile(wp.PtyFile, finalizer) |
There was a problem hiding this comment.
Please comment this function well as it is not obvious and we will forget why it is implemented in such a way
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1461/ |
voievodin
approved these changes
Dec 27, 2016
garagatyi
approved these changes
Dec 28, 2016
…nal. Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>
AndrienkoAleksandr
force-pushed
the
CHE-3216
branch
from
20f39d4 to
169cb12
Compare
|
ci-build |
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/1574/ |
JPinkney
pushed a commit
to JPinkney/che
that referenced
this pull request
Aug 17, 2017
…nal. (eclipse-che#3395) Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>
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.
What does this PR do?
Create new type websocket message to realise ability to kill terminal process and its child processes when user click "close button".
What issues does this PR fix or reference?
#3216
@evoevodin and @garagatyi review please.
Signed-off-by: Aleksandr Andrienko aandrienko@codenvy.com