Merge pull request #1972 from weaveworks/persist-peers

Persist set of peers to connect to
This commit is contained in:
Adam Harrison committed 2016-02-29 15:54:54 +00:00
commit 71af1f3120
5 files changed
+65 -17

No files matched your search

+6 -3
View File
@@ -153,7 +153,6 @@ func main() {
}
Log.Println("Command line options:", options())
Log.Println("Command line peers:", peers)
go check()
@@ -194,9 +193,13 @@ func main() {
checkFatal(err)
defer db.Close()
router := weave.NewNetworkRouter(config, networkConfig, name, nickName, overlay)
router := weave.NewNetworkRouter(config, networkConfig, name, nickName, overlay, db)
Log.Println("Our name is", router.Ourself)
if peers, err = router.InitialPeers(peers); err != nil {
Log.Fatal("Unable to get initial peer set: ", err)
}
var dockerCli *docker.Client
if dockerAPI != "" {
dc, err := docker.NewClient(dockerAPI)
@@ -243,7 +246,7 @@ func main() {
}
router.Start()
if errors := router.ConnectionMaker.InitiateConnections(peers, false); len(errors) > 0 {
if errors := router.InitiateConnections(peers, false); len(errors) > 0 {
Log.Fatal(ErrorMessages(errors))
}