Skip to content

[18.03 backport] Avoid predefined error log, and Test if error is nil before to log it #2722

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

Closed
thaJeztah wants to merge 2 commits into from
Closed

[18.03 backport] Avoid predefined error log, and Test if error is nil before to log it #2722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d52a6c8
Avoid predefined error log
Mar 16, 2018
acefa73
Test if error is nil before to log it
nmengin Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,15 +882,13 @@ func (m *Manager) becomeLeader(ctx context.Context) {
}
}
// Create now the static predefined if the store does not contain predefined
//networks like bridge/host node-local networks which
// networks like bridge/host node-local networks which
// are known to be present in each cluster node. This is needed
// in order to allow running services on the predefined docker
// networks like `bridge` and `host`.
for _, p := range allocator.PredefinedNetworks() {
if store.GetNetwork(tx, p.Name) == nil {
if err := store.CreateNetwork(tx, newPredefinedNetwork(p.Name, p.Driver)); err != nil {
log.G(ctx).WithError(err).Error("failed to create predefined network " + p.Name)
}
if err := store.CreateNetwork(tx, newPredefinedNetwork(p.Name, p.Driver)); err != nil && err != store.ErrNameConflict {
log.G(ctx).WithError(err).Error("failed to create predefined network " + p.Name)
}
}
return nil
Expand Down