diff --git a/core/deliverservice/blocksprovider/blocksprovider.go b/core/deliverservice/blocksprovider/blocksprovider.go index 919b193875d..ced37851384 100644 --- a/core/deliverservice/blocksprovider/blocksprovider.go +++ b/core/deliverservice/blocksprovider/blocksprovider.go @@ -117,26 +117,26 @@ func (b *blocksProviderImpl) DeliverBlocks() { for !b.isDone() { msg, err := b.client.Recv() if err != nil { - logger.Warningf("Receive error: %s", err.Error()) + logger.Warningf("[%s] Receive error: %s", b.chainID, err.Error()) return } switch t := msg.Type.(type) { case *orderer.DeliverResponse_Status: if t.Status == common.Status_SUCCESS { - logger.Warning("ERROR! Received success for a seek that should never complete") + logger.Warningf("[%s] ERROR! Received success for a seek that should never complete", b.chainID) return } - logger.Warning("Got error ", t) + logger.Warningf("[%s] Got error %v", b.chainID, t) case *orderer.DeliverResponse_Block: seqNum := t.Block.Header.Number marshaledBlock, err := proto.Marshal(t.Block) if err != nil { - logger.Errorf("Error serializing block with sequence number %d, due to %s", seqNum, err) + logger.Errorf("[%s] Error serializing block with sequence number %d, due to %s", b.chainID, seqNum, err) continue } if err := b.mcs.VerifyBlock(gossipcommon.ChainID(b.chainID), seqNum, marshaledBlock); err != nil { - logger.Errorf("Error verifying block with sequnce number %d, due to %s", seqNum, err) + logger.Errorf("[%s] Error verifying block with sequnce number %d, due to %s", b.chainID, seqNum, err) continue } @@ -146,15 +146,15 @@ func (b *blocksProviderImpl) DeliverBlocks() { // Use payload to create gossip message gossipMsg := createGossipMsg(b.chainID, payload) - logger.Debugf("Adding payload locally, buffer seqNum = [%d], peers number [%d]", seqNum, numberOfPeers) + logger.Debugf("[%s] Adding payload locally, buffer seqNum = [%d], peers number [%d]", b.chainID, seqNum, numberOfPeers) // Add payload to local state payloads buffer b.gossip.AddPayload(b.chainID, payload) // Gossip messages with other nodes - logger.Debugf("Gossiping block [%d], peers number [%d]", seqNum, numberOfPeers) + logger.Debugf("[%s] Gossiping block [%d], peers number [%d]", b.chainID, seqNum, numberOfPeers) b.gossip.Gossip(gossipMsg) default: - logger.Warning("Received unknown: ", t) + logger.Warningf("[%s] Received unknown: ", b.chainID, t) return } } diff --git a/core/deliverservice/deliveryclient.go b/core/deliverservice/deliveryclient.go index c22ea0ec23e..c9aee4fb66d 100644 --- a/core/deliverservice/deliveryclient.go +++ b/core/deliverservice/deliveryclient.go @@ -140,7 +140,7 @@ func (d *deliverServiceImpl) StartDeliverForChannel(chainID string, ledgerInfo b return errors.New(errMsg) } else { client := d.newClient(chainID, ledgerInfo) - logger.Debug("This peer will pass blocks from orderer service to other peers") + logger.Debug("This peer will pass blocks from orderer service to other peers for channel", chainID) d.blockProviders[chainID] = blocksprovider.NewBlocksProvider(chainID, client, d.conf.Gossip, d.conf.CryptoSvc) go d.blockProviders[chainID].DeliverBlocks() } diff --git a/core/deliverservice/requester.go b/core/deliverservice/requester.go index 00f867f0801..7705a1223c2 100644 --- a/core/deliverservice/requester.go +++ b/core/deliverservice/requester.go @@ -34,17 +34,17 @@ type blocksRequester struct { func (b *blocksRequester) RequestBlocks(ledgerInfoProvider blocksprovider.LedgerInfo) error { height, err := ledgerInfoProvider.LedgerHeight() if err != nil { - logger.Errorf("Can't get legder height from committer [%s]", err) + logger.Errorf("Can't get legder height for channel %s from committer [%s]", b.chainID, err) return err } if height > 0 { - logger.Debugf("Starting deliver with block [%d]", height) + logger.Debugf("Starting deliver with block [%d] for channel %s", height, b.chainID) if err := b.seekLatestFromCommitter(height); err != nil { return err } } else { - logger.Debug("Starting deliver with olders block") + logger.Debugf("Starting deliver with olders block for channel %s", b.chainID) if err := b.seekOldest(); err != nil { return err }