You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/06/16 16:46:21 UTC
[plc4x] 04/07: feat(plc4go/spi): improve logging for request transaction
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 65796b03e9dbba26ab533ecafb3703e727f15d04
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jun 16 18:04:20 2023 +0200
feat(plc4go/spi): improve logging for request transaction
---
plc4go/spi/transactions/RequestTransaction.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/plc4go/spi/transactions/RequestTransaction.go b/plc4go/spi/transactions/RequestTransaction.go
index 027df85cc1..18f88c7293 100644
--- a/plc4go/spi/transactions/RequestTransaction.go
+++ b/plc4go/spi/transactions/RequestTransaction.go
@@ -105,16 +105,17 @@ func (t *requestTransaction) Submit(operation RequestTransactionRunnable) {
if t.operation != nil {
t.transactionLog.Warn().Msg("Operation already set")
}
- t.transactionLog.Trace().Msgf("Submission of transaction %d", t.transactionId)
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Submission")
t.operation = func() {
- t.transactionLog.Trace().Msgf("Start execution of transaction %d", t.transactionId)
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Start operation")
operation(t)
- t.transactionLog.Trace().Msgf("Completed execution of transaction %d", t.transactionId)
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Completed operation")
}
t.parent.submitTransaction(t)
}
func (t *requestTransaction) AwaitCompletion(ctx context.Context) error {
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Awaiting completion")
timeout, cancelFunc := context.WithTimeout(ctx, time.Minute*30) // This is intentionally set very high
defer cancelFunc()
for t.completionFuture == nil {
@@ -125,6 +126,7 @@ func (t *requestTransaction) AwaitCompletion(ctx context.Context) error {
}
}
if err := t.completionFuture.AwaitCompletion(ctx); err != nil {
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Errored")
return err
}
stillActive := true
@@ -139,6 +141,7 @@ func (t *requestTransaction) AwaitCompletion(ctx context.Context) error {
}
t.parent.runningRequestMutex.RUnlock()
}
+ t.transactionLog.Trace().Int32("transactionId", t.transactionId).Msg("Completed")
return nil
}