[FAB-3287] Fix debug statements in orderer package

Change-Id: If8fd43e256bfcf6a8d3f21a3262707ccc5e3c134 Signed-off-by: Kostas Christidis <kostas@christidis.io>
hyperledger · Apr 24, 2017 · 1dfd0aa · 1dfd0aa
1 parent 8ce1073
commit 1dfd0aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/orderer/common/broadcast/broadcast.go b/orderer/common/broadcast/broadcast.go
@@ -74,6 +74,7 @@ func NewHandlerImpl(sm SupportManager) Handler {
 
 // Handle starts a service thread for a given gRPC connection and services the broadcast connection
 func (bh *handlerImpl) Handle(srv ab.AtomicBroadcast_BroadcastServer) error {
+	logger.Debugf("Starting new broadcast loop")
 	for {
 		msg, err := srv.Recv()
 		if err == io.EOF {
@@ -142,7 +143,7 @@ func (bh *handlerImpl) Handle(srv ab.AtomicBroadcast_BroadcastServer) error {
 		}
 
 		if logger.IsEnabledFor(logging.DEBUG) {
-			logger.Debugf("Broadcast is filtering message of type %d for channel %s", chdr.Type, chdr.ChannelId)
+			logger.Debugf("Broadcast is filtering message of type %s for channel %s", cb.HeaderType_name[chdr.Type], chdr.ChannelId)
 		}
 
 		// Normal transaction for existing chain

diff --git a/orderer/common/deliver/deliver.go b/orderer/common/deliver/deliver.go
@@ -128,7 +128,7 @@ func (ds *deliverServer) Handle(srv ab.AtomicBroadcast_DeliverServer) error {
 		}
 
 		if logger.IsEnabledFor(logging.DEBUG) {
-			logger.Debugf("Received seekInfo (%p)  %v for chain %s", seekInfo, seekInfo, chdr.ChannelId)
+			logger.Debugf("Received seekInfo (%p) %v for chain %s", seekInfo, seekInfo, chdr.ChannelId)
 		}
 
 		cursor, number := chain.Reader().Iterator(seekInfo.Start)

diff --git a/orderer/kafka/orderer.go b/orderer/kafka/orderer.go
@@ -292,7 +292,7 @@ func (ch *chainImpl) loop() {
 					continue
 				}
 				batches, committers, ok := ch.support.BlockCutter().Ordered(env)
-				logger.Debugf("[channel: %s] Ordering results: batches: %v, ok: %v", ch.support.ChainID(), batches, ok)
+				logger.Debugf("[channel: %s] Ordering results: items in batch = %v, ok = %v", ch.support.ChainID(), batches, ok)
 				if ok && len(batches) == 0 && timer == nil {
 					timer = time.After(ch.batchTimeout)
 					logger.Debugf("[channel: %s] Just began %s batch timer", ch.support.ChainID(), ch.batchTimeout.String())