perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Decouple local from global announcing (fixes #132)

Browse Source
This commit is contained in:
Jakob Borg
2014-04-16 16:49:01 +02:00
parent f72ee7a69e
commit 31bfd8c039
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/syncthing/main.go
View File

@@ -468,22 +468,20 @@ next:
}
func discovery() *discover.Discoverer {
if !cfg.Options.LocalAnnEnabled {
disc, err := discover.NewDiscoverer(myID, cfg.Options.ListenAddress)
if err != nil {
warnf("No discovery possible (%v)", err)
return nil
}
infoln("Sending local discovery announcements")
if !cfg.Options.GlobalAnnEnabled {
cfg.Options.GlobalAnnServer = ""
} else {
infoln("Sending external discovery announcements")
if cfg.Options.LocalAnnEnabled {
infoln("Sending local discovery announcements")
disc.StartLocal()
}
disc, err := discover.NewDiscoverer(myID, cfg.Options.ListenAddress, cfg.Options.GlobalAnnServer)
if err != nil {
warnf("No discovery possible (%v)", err)
if cfg.Options.GlobalAnnEnabled {
infoln("Sending external discovery announcements")
disc.StartGlobal(cfg.Options.GlobalAnnServer)
}
return disc