kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 17:35:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

consul syncer uses multi-error

Browse Source
This commit is contained in:
Alex Dadgar
2016-08-09 12:24:50 -07:00
parent 4e7e8d7c4c
commit 08628fea90
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
command/agent/consul/syncer.go
View File

@@ -826,17 +826,17 @@ func (c *Syncer) RunHandlers() error {
// SyncServices sync the services with the Consul Agent
func (c *Syncer) SyncServices() error {
var mErr multierror.Error
if err := c.syncServices(); err != nil {
mErr.Errors = append(mErr.Errors, err)
}
if err := c.syncChecks(); err != nil {
mErr.Errors = append(mErr.Errors, err)
}
if err := c.RunHandlers(); err != nil {
return err
}
if err := c.syncServices(); err != nil {
return err
}
if err := c.syncChecks(); err != nil {
return err
}
return nil
return mErr.ErrorOrNil()
}
// filterConsulServices prunes out all the service who were not registered with