Merge "Remove repeating log outputs"

hyperledger · Jan 13, 2017 · 9e8fb87 · 9e8fb87
2 parents b7f7e58 + 67c02b8
commit 9e8fb87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go
@@ -36,7 +36,6 @@ import (
 	"github.com/hyperledger/fabric/gossip/identity"
 	"github.com/hyperledger/fabric/gossip/proto"
 	"github.com/hyperledger/fabric/gossip/util"
-	"github.com/op/go-logging"
 	"google.golang.org/grpc"
 )
 
@@ -124,8 +123,6 @@ func NewGossipService(conf *Config, s *grpc.Server, secAdvisor api.SecurityAdvis
 
 	g.certStore = newCertStore(g.createCertStorePuller(), idMapper, selfIdentity, mcs)
 
-	g.logger.SetLevel(logging.DEBUG)
-
 	go g.start()
 
 	return g
@@ -181,11 +178,12 @@ func (g *gossipServiceImpl) handlePresumedDead() {
 }
 
 func (g *gossipServiceImpl) syncDiscovery() {
+	g.logger.Debugf("Entering discovery sync with interal %ds", g.conf.PullInterval)
 	defer g.logger.Debug("Exiting discovery sync loop")
 	for !g.toDie() {
-		g.logger.Debug("Intiating discovery sync")
+		//g.logger.Debug("Intiating discovery sync")
 		g.disc.InitiateSync(g.conf.PullPeerNum)
-		g.logger.Debug("Sleeping", g.conf.PullInterval)
+		//g.logger.Debug("Sleeping", g.conf.PullInterval)
 		time.Sleep(g.conf.PullInterval)
 	}
 }

diff --git a/gossip/state/state.go b/gossip/state/state.go
@@ -55,7 +55,6 @@ var remoteStateMsgFilter = func(message interface{}) bool {
 	return message.(comm.ReceivedMessage).GetGossipMessage().IsRemoteStateMessage()
 }
 
-
 const (
 	defPollingPeriod       = 200 * time.Millisecond
 	defAntiEntropyInterval = 10 * time.Second
@@ -333,11 +332,11 @@ func (s *GossipStateProviderImpl) antiEntropy() {
 
 		if current == max {
 			// No messages in the buffer or there are no gaps
-			s.logger.Debugf("Current ledger height is the same as ledger height on other peers.")
+			//s.logger.Debugf("Current ledger height is the same as ledger height on other peers.")
 			continue
 		}
 
-		s.logger.Debugf("Requesting new blocks in range [%d...%d].", current+1, max)
+		//s.logger.Debugf("Requesting new blocks in range [%d...%d].", current+1, max)
 		s.requestBlocksInRange(uint64(current+1), uint64(max))
 	}
 	s.logger.Debug("[XXX]: Stateprovider stopped, stoping anti entropy procedure.")