From d9684fcceb20c147314c12ed9def03d1c48b9175 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 17 May 2023 10:57:51 +0200 Subject: [PATCH 1/2] app/ship_processor.go: Log tx_id when processing trace. --- app/ship_processor.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/ship_processor.go b/app/ship_processor.go index 13443a9..d755fbe 100644 --- a/app/ship_processor.go +++ b/app/ship_processor.go @@ -126,6 +126,8 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { if block.Traces != nil && len(block.Traces.Elem) > 0 { for _, trace := range block.Traces.AsTransactionTracesV0() { + logger := log.WithField("tx_id", trace.ID.String()) + processor.encodeQueue(api.TransactionChannel, trace) // Actions @@ -156,7 +158,7 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { if act_trace.Act.Account == processor.syscontract && act_trace.Act.Name == eos.ActionName("setabi") { err := processor.updateAbiFromAction(act_trace.Act) if err != nil { - log.WithError(err).Warn("Failed to update abi") + logger.WithError(err).Warn("Failed to update abi") } } @@ -179,10 +181,10 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { ABI, err := processor.abi.GetAbi(act_trace.Act.Account) if err == nil { if err = decode(ABI, act_trace.Act, &act.Data); err != nil { - log.WithError(err).Warn("Failed to decode action") + logger.WithError(err).Warn("Failed to decode action") } } else { - log.WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account) + logger.WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account) } payload, err := processor.encode(act) From 860e7bbe9fa6eb209076108e3d6ba7d47a2d1285 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 17 May 2023 11:01:45 +0200 Subject: [PATCH 2/2] app/ship_processor.go: Log more fields on abi decode error. --- app/ship_processor.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/ship_processor.go b/app/ship_processor.go index d755fbe..f02dc07 100644 --- a/app/ship_processor.go +++ b/app/ship_processor.go @@ -181,10 +181,14 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { ABI, err := processor.abi.GetAbi(act_trace.Act.Account) if err == nil { if err = decode(ABI, act_trace.Act, &act.Data); err != nil { - logger.WithError(err).Warn("Failed to decode action") + logger.WithFields(log.Fields{ + "contract": act_trace.Act.Account, + "action": act_trace.Act.Name, + }).WithError(err).Warn("Failed to decode action") } } else { - logger.WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account) + logger.WithField("contract", act_trace.Act.Account). + WithError(err).Errorf("Failed to get abi for contract %s", act_trace.Act.Account) } payload, err := processor.encode(act)