This repository has been archived by the owner on Jun 20, 2024. It is now read-only.
Move kill-on-failure responsibility to caller of weave script #2296
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
bboreham
force-pushed
the
issues/2284-die-another-way
branch
from
be7955b
to
56b2a31
Compare
| // attach failed: if we have a request waiting on the start, kill the container, | ||
| // otherwise assume it is a Docker-initated restart and kill the process inside. | ||
| if proxy.waitChan(ident) != nil { | ||
| proxy.client.KillContainer(docker.KillContainerOptions{ID: ident}) |
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.
bboreham
force-pushed
the
issues/2284-die-another-way
branch
from
56b2a31
to
ff81ecf
Compare
|
Added some error handling and squashed commits. |
| } | ||
| } | ||
| if e != nil { | ||
| Log.Warningf("Error killing %s: %s", ident, e) |
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.
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.
Fixes #2284; also ends up rather simpler. Undoes much of #2264.
The change also removes two flags from the interface of
attach(), at the cost of a duplicateInspectin case of error. I prefer it that way.