Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
#4947
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
|
@tianon travis failed |
|
hahahaha, gofmt :) Thanks, will update. |
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
|
Fixed. :) |
| @@ -144,6 +144,10 @@ func (srv *Server) ContainerKill(job *engine.Job) engine.Status { | |||
| if err != nil { | |||
| // The signal is not a number, treat it as a string | |||
| sig = uint64(signal.SignalMap[job.Args[1]]) | |||
| if sig == 0 && strings.HasPrefix(job.Args[1], "SIG") { | |||
| // If signal is prefixed with SIG, try with it stripped (ie, "SIGKILL", etc) | |||
| sig = uint64(signal.SignalMap[job.Args[1][3:]]) | |||
There was a problem hiding this comment.
I would rather use strings.TrimPrefix
There was a problem hiding this comment.
Not sure about this. we already rely on strings.HadPrefix() so we know that we can safely do this.
There was a problem hiding this comment.
Why not just always use strings.TrimPrefix and not worry about the if?
|
LGTM. WIth or without the changes :) |
|
LGTM |
crosbymichael
added a commit
that referenced
this pull request
Apr 1, 2014
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
|
Hah, couldn't even wait for me to fix it? :) |
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.
This way, we can use both
docker kill -s INT some_containeranddocker kill -s SIGINT some_containerand both will do nice things for us. :)