add locks for conn

diff --git a/toolbar/precog/monitor/connection.go b/toolbar/precog/monitor/connection.go
index ef9cd0e..ed6df81 100644 (file)
--- a/toolbar/precog/monitor/connection.go
+++ b/toolbar/precog/monitor/connection.go
@@ -13,6 +13,7 @@ func (m *monitor) connectNodesRoutine() {
        ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second)
        for ; true; <-ticker.C {
                <-m.dialCh
+               m.Lock()
                if err := m.dialNodes(); err != nil {
                        log.Error(err)
                }

diff --git a/toolbar/precog/monitor/discover.go b/toolbar/precog/monitor/discover.go
index 002cba0..72c1e00 100644 (file)
--- a/toolbar/precog/monitor/discover.go
+++ b/toolbar/precog/monitor/discover.go
@@ -24,8 +24,9 @@ func (m *monitor) discoveryRoutine(discvWg *sync.WaitGroup) {
                m.Lock()
                for i := 0; i < n; i++ {
                        m.discvCh <- nodes[i]
-                       // wg.Add(1)
+                       discvWg.Add(1)
                }
+               discvWg.Wait()
                m.Unlock()
        }
 }
@@ -48,5 +49,7 @@ func (m *monitor) collectDiscoveredNodes(discvWg *sync.WaitGroup) {
                } else {
                        log.Error(err)
                }
+
+               discvWg.Done()
        }
 }

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 3dc14a3..96e40db 100644 (file)
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -216,6 +216,7 @@ func (m *monitor) checkStatusRoutine() {
                        peers.RemovePeer(p.ID())
                }
                log.Info("Disonnect all peers.")
+               m.Unlock()
                m.dialCh <- struct{}{}
        }
 }