mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #1408 from mrjana/agent
Notify agentInitDone after joining the cluster
This commit is contained in:
commit
c5629b7a14
1 changed files with 7 additions and 4 deletions
|
@ -183,17 +183,20 @@ func (c *controller) agentSetup() error {
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if remoteAddr != "" {
|
||||||
|
if err := c.agentJoin(remoteAddr); err != nil {
|
||||||
|
logrus.Errorf("Error in agentJoin : %v", err)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if c.agent != nil {
|
if c.agent != nil {
|
||||||
close(c.agentInitDone)
|
close(c.agentInitDone)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
if remoteAddr != "" {
|
|
||||||
if err := c.agentJoin(remoteAddr); err != nil {
|
|
||||||
logrus.Errorf("Error in agentJoin : %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue