Merge pull request #1142 from rlan35/rj_fork2

Revert "fix cpu issues at networkinfo service"

api/service/networkinfo/service.go

@@ -48,9 +48,6 @@ const (
 
 	// register to bootnode every ticker
 	dhtTicker = 6 * time.Hour
-
-	// wait for peerinfo.
-	peerInfoWait = time.Second
 )
 
 // New returns role conversion service.
@@ -164,10 +161,7 @@ func (s *Service) DoService() {
 		return
 	}
 	tick := time.NewTicker(dhtTicker)
-	peerInfoTick := time.NewTicker(peerInfoWait)
 	for {
-		select {
-		case <-peerInfoTick.C:
 		select {
 		case peer := <-s.peerInfo:
 			if peer.ID != s.Host.GetP2PHost().ID() && len(peer.ID) > 0 {
@@ -194,17 +188,12 @@ func (s *Service) DoService() {
 						break
 					}
 				}
-					if ip != "" {
 				p := p2p.Peer{IP: ip, Port: port, PeerID: peer.ID, Addrs: peer.Addrs}
 				utils.GetLogInstance().Info("Notify peerChan", "peer", p)
 				if s.peerChan != nil {
 					s.peerChan <- p
 				}
 			}
-				}
-			default:
-				utils.GetLogInstance().Info("Got no peer from peerInfo")
-			}
 		case <-s.stopChan:
 			return
 		case <-tick.C: