This repository has been archived by the owner on Jun 20, 2024. It is now read-only.
Implement weaveexec signal proxy #523
Closed
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
| @@ -10,6 +10,7 @@ DOCKERHUB_USER=zettio | |||
| WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD) | |||
| WEAVER_EXE=weaver/weaver | |||
| WEAVEDNS_EXE=weavedns/weavedns | |||
| SIGPROXY_EXE=sigproxy/sigproxy | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
|
||
| func installSignalHandler() chan os.Signal { | ||
| sc := make(chan os.Signal, 1) | ||
| signal.Notify(sc, syscall.SIGINT) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
| // required to access system-dependent exit information | ||
| if exitErr, ok := err.(*exec.ExitError); ok { | ||
| if waitStatus, ok := exitErr.Sys().(syscall.WaitStatus); ok { | ||
| os.Exit(waitStatus.ExitStatus()) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
| } else { | ||
| os.Exit(0) | ||
| } | ||
| } |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
Simplify waitAndExit Commented makefile Support SIGTERM Remove superfluous type assertion check Inlined functions Remove superfluous --sig-proxy argument to docker run
|
LGTM, but would like @dpw to take a look. |
|
The long comment line in the makefile needs a M-q. Fine otherwise. |
Even worse - it has trailing whitespace! |
This was referenced Apr 11, 2015
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Address #507 (
weaveandweave --localbehave differently).Introduce an intermediate signal proxying process that:
docker run --sig-proxy=true) to its own process group, which includes the shell running the weave script and any subprocesses (such ascurl) it is executingAs a consequence we can disable the problematic docker pseudoterminal allocation without losing the ability to interrupt the script running in the weaveexec container.