Skip to content
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

Jump to bottom

#507 - make docker run handle SIGINT/SIGTERM #1249

Merged
merged 4 commits into from
Aug 14, 2013
Merged

#507 - make docker run handle SIGINT/SIGTERM #1249

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df86cb9
make docker run handle SIGINT/SIGTERM
unclejack Jul 20, 2013
88cb9f3
keep processing signals after the first one
unclejack Aug 9, 2013
2ba5c91
minor cleanup for signal handling
unclejack Aug 9, 2013
641ddae
add formatting directive to failure to stop container error
unclejack Aug 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,6 +1393,17 @@ func (cli *DockerCli) CmdRun(args ...string) error {
v.Set("stderr", "1")
}

signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason for these to be in this scope as opposed to the anonymous function below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recall I had to place those statements there to avoid some kind of race condition at the time. I don't remember what was happening, though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah, I see. It seems like a really fast Ctrl-C might not be caught?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's one of the problems.

go func() {
for sig := range signals {
fmt.Printf("\nReceived signal: %s; cleaning up\n", sig)
if err := cli.CmdStop("-t", "4", runResult.ID); err != nil {
fmt.Printf("failed to stop container: %v", err)
}
}
}()

if err := cli.hijack("POST", "/containers/"+runResult.ID+"/attach?"+v.Encode(), config.Tty, cli.in, cli.out); err != nil {
utils.Debugf("Error hijack: %s", err)
return err
Expand Down