clean up

diff --git a/toolbar/precog/monitor/connection.go b/toolbar/precog/monitor/connection.go
index c0db747..475ba9c 100644 (file)
--- a/toolbar/precog/monitor/connection.go
+++ b/toolbar/precog/monitor/connection.go
@@ -14,8 +14,6 @@ func (m *monitor) connectionRoutine() {
        // ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqMinutes) * time.Minute)
        ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqMinutes) * time.Second)
        for ; true; <-ticker.C {
-               m.Lock()
-
                if err := m.dialNodes(); err != nil {
                        log.WithFields(log.Fields{"err": err}).Error("dialNodes")
                }
@@ -79,6 +77,4 @@ func (m *monitor) checkStatus() {
                m.peers.RemovePeer(p.ID())
        }
        log.Info("Disonnect all peers.")
-
-       m.Unlock()
 }

diff --git a/toolbar/precog/monitor/discover.go b/toolbar/precog/monitor/discover.go
index e7cc8b3..ea799dc 100644 (file)
--- a/toolbar/precog/monitor/discover.go
+++ b/toolbar/precog/monitor/discover.go
@@ -19,8 +19,6 @@ func (m *monitor) discoveryRoutine() {
        discvMap := make(map[string]*dht.Node)
        ticker := time.NewTicker(time.Duration(discvFreqSec) * time.Second)
        for range ticker.C {
-               m.Lock()
-
                nodes := make([]*dht.Node, nodesToDiscv)
                num := m.sw.GetDiscv().ReadRandomNodes(nodes)
                for _, node := range nodes[:num] {
@@ -40,7 +38,5 @@ func (m *monitor) discoveryRoutine() {
                                discvMap[node.ID.String()] = node
                        }
                }
-
-               m.Unlock()
        }
 }

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 7d455a4..6be8463 100644 (file)
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -5,7 +5,6 @@ import (
        "os"
        "os/user"
        "strings"
-       "sync"
 
        "github.com/jinzhu/gorm"
        log "github.com/sirupsen/logrus"
@@ -35,7 +34,6 @@ import (
 // 7. m这个为什么需要锁呀？一个是节点发现，一个是生命探测，中间交互都是数据库把？
 
 type monitor struct {
-       *sync.RWMutex
        cfg            *config.Config
        db             *gorm.DB
        nodeCfg        *vaporCfg.Config
@@ -71,7 +69,6 @@ func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
        }
 
        return &monitor{
-               RWMutex:        &sync.RWMutex{},
                cfg:            cfg,
                db:             db,
                nodeCfg:        nodeCfg,