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.

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

Fixes watch tracking during reloads and fixes address issue. #3189

Merged
merged 5 commits into from
Jun 24, 2017

Conversation

slackpad
Copy link
Contributor

Fixes #3177.
Closes #3181.
Closes #3186.

magiconair and others added 5 commits June 23, 2017 15:34
This patch fixes watch registration through the config file
and a broken log line when the watch registration fails.

Fixes #3177
This plumbs all the watch loading through a common function and tweaks the
unit test to create the watch before the reload.
Copy link
Contributor

@magiconair magiconair left a comment

Choose a reason for hiding this comment

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

Two nit-picks other than that LGTM.

agent/agent.go Outdated
httpAddr, err := newCfg.ClientListener(newCfg.Addresses.HTTP, newCfg.Ports.HTTP)
if err != nil {
errs = multierror.Append(errs, fmt.Errorf("Failed to determine HTTP address: %v", err))
// Reload the watches.
Copy link
Contributor

Choose a reason for hiding this comment

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

Comment is redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed in 4a3604a.

for _, w := range cfg.WatchPlans {
if !w.IsStopped() {

// Verify that previous config's watch plans were stopped.
Copy link
Contributor

Choose a reason for hiding this comment

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

Comment is redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed in 4a3604a.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants