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

Show status of global announce server (fixes #71)

Browse Source
This commit is contained in:
Jakob Borg
2014-04-16 17:36:09 +02:00
parent 31bfd8c039
commit b802cb1e36
4 changed files with 69 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/syncthing/main.go
View File

@@ -33,6 +33,7 @@ var (
confDir string
rateBucket *ratelimit.Bucket
stop = make(chan bool)
discoverer *discover.Discoverer
)
const (
@@ -228,8 +229,8 @@ func main() {
m.SaveIndexes(confDir)
// Routine to connect out to configured nodes
disc := discovery()
go listenConnect(myID, disc, m, tlsCfg)
discoverer = discovery()
go listenConnect(myID, m, tlsCfg)
for _, repo := range cfg.Repositories {
// Routine to pull blocks from other nodes to synchronize the local
@@ -337,7 +338,7 @@ func saveConfig() {
saveConfigCh <- struct{}{}
}
func listenConnect(myID string, disc *discover.Discoverer, m *Model, tlsCfg *tls.Config) {
func listenConnect(myID string, m *Model, tlsCfg *tls.Config) {
var conns = make(chan *tls.Conn)
// Listen
@@ -389,8 +390,8 @@ func listenConnect(myID string, disc *discover.Discoverer, m *Model, tlsCfg *tls
var addrs []string
for _, addr := range nodeCfg.Addresses {
if addr == "dynamic" {
if disc != nil {
t := disc.Lookup(nodeCfg.NodeID)
if discoverer != nil {
t := discoverer.Lookup(nodeCfg.NodeID)
if len(t) == 0 {
continue
}