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

cluster: Proceed with startup if cluster component can't be created #31631

Merged
merged 1 commit into from Mar 22, 2017
Merged

cluster: Proceed with startup if cluster component can't be created #31631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions daemon/cluster/cluster.go
View file
Open in desktop
Expand Up @@ -39,7 +39,6 @@ package cluster
//

import (
"crypto/x509"
"fmt"
"net"
"os"
Expand Down Expand Up @@ -171,13 +170,8 @@ func New(config Config) (*Cluster, error) {
logrus.Error("swarm component could not be started before timeout was reached")
case err := <-nr.Ready():
if err != nil {
if errors.Cause(err) == errSwarmLocked {
return c, nil
}
if err, ok := errors.Cause(c.nr.err).(x509.CertificateInvalidError); ok && err.Reason == x509.Expired {
return c, nil
}
return nil, errors.Wrap(err, "swarm component could not be started")
logrus.WithError(err).Error("swarm component could not be started")
return c, nil
}
}
return c, nil
Expand Down