8000 Retry docker event subscription by awh · Pull Request #2049 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Retry docker event subscription #2049

Merged
merged 2 commits into from
Mar 16, 2016
Merged

Retry docker event subscription #2049

merged 2 commits into from
Mar 16, 2016

Conversation

awh
Copy link
Contributor
@awh awh commented Mar 16, 2016

Fixes #2016.

@awh awh added this to the 1.4.6 milestone Mar 16, 2016
bboreham
bboreham reviewed Mar 16, 2016
View reviewed changes
common/docker/client.go
case "die":
id := event.ID
ob.ContainerDied(id)
retryInterval := InitialInterval

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@awh awh force-pushed the issues/2016-retry-docker-event-subscription branch from c0f46ad to 922f465 Compare March 16, 2016 13:41
@awh
Copy link
Contributor Author
awh commented Mar 16, 2016

record the amount of time we spend in the event loop and if it exceeds the retryInterval when the channel closes we reset

@bboreham implemented - PTAL

rade
rade reviewed Mar 16, 2016
View reviewed changes
common/docker/client.go

docker "github.com/fsouza/go-dockerclient"

. "github.com/weaveworks/weave/common"
)

const (
InitialInterval = 1 * time.Second
MaxInterval = 60 * time.Second

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

bboreham added a commit that referenced this pull request Mar 16, 2016
@bboreham
Merge pull request #2049 from /issues/2016-retry-docker-event-subscri…
9c09652 
…ption

Retry docker event subscription
@bboreham bboreham merged commit 9c09652 into 1.4 Mar 16, 2016
@awh awh deleted the issues/2016-retry-docker-event-subscription branch March 17, 2016 11:29
@rade rade mentioned this pull request Mar 18, 2016
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.4.6
Development

Successfully merging this pull request may close these issues.
3 participants
@awh @rade @bboreham
0