verification: Clean up logging when checking transaction IDs#440
Open
bradtgmurray wants to merge 3 commits intomainfrom
Open
verification: Clean up logging when checking transaction IDs#440bradtgmurray wants to merge 3 commits intomainfrom
bradtgmurray wants to merge 3 commits intomainfrom
Conversation
bradtgmurray
commented
Dec 8, 2025
| log = log.With().Stringer("transaction_id", transactionID).Logger() | ||
|
|
||
| vh.activeTransactionsLock.Lock() | ||
| defer vh.activeTransactionsLock.Unlock() |
Contributor
Author
There was a problem hiding this comment.
Changing to use defer and changing this to return a *VerificationTransaction should be the only changes to this code after factoring it out.
sumnerevans
reviewed
Dec 16, 2025
| Stringer("sender", evt.Sender). | ||
| Stringer("room_id", evt.RoomID). | ||
| Stringer("event_id", evt.ID). | ||
| Stringer("event_type", evt.Type). |
Member
There was a problem hiding this comment.
Just a note, this change looses the event_type key from the callback's logger. I'm not sure how useful it is (and it might be added to the context somewhere else).
Contributor
Author
There was a problem hiding this comment.
Good catch, fixed!
sumnerevans
approved these changes
Jan 6, 2026
Member
sumnerevans
left a comment
sumnerevans
left a comment
There was a problem hiding this comment.
The defer is a really nice refactor. It's a lot cleaner than what I wrote 😂
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
wrapHandlerwas nesting contexts, so when adding theverification_action=check transaction IDportion it reused that same context when calling the supplied callback, which then added a new set of parameters and duplicatedverification_actionand others.Also refactor checkTransactionID into it's own function so it's easier to read as it's own step, make it clear we throw away that derived context with the fields, and take advantage of
deferfor unlocking.