backport: merge bitcoin#23235, #23104, #24770, #24830, #24464, #24757, #25202, #25217, #25292, #25614, partial bitcoin#22766 (logging backports)#6399
Merged
PastaPastaPasta merged 14 commits intodashpay:developfrom Nov 26, 2024
Conversation
kwvg
force-pushed
the
logports
branch
2 times, most recently
from
bfc4d24 to
e6eef52
Compare
should apply suggestions and add diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 0e8a5f2886..f3e53442e3 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1346,11 +1346,15 @@ void CSigSharesManager::Cleanup()
}
}
- LogPrintLevel(BCLog::LLMQ_SIGS, BCLog::Level::Info, "CSigSharesManager::%s -- signing session timed out. signHash=%s, id=%s, msgHash=%s, sigShareCount=%d, missingMembers=%s\n", __func__,
- signHash.ToString(), oneSigShare.getId().ToString(), oneSigShare.getMsgHash().ToString(), count, strMissingMembers);
+ LogPrintLevel(BCLog::LLMQ_SIGS, BCLog::Level::Info, /* Continued */
+ "CSigSharesManager::%s -- signing session timed out. signHash=%s, id=%s, msgHash=%s, "
+ "sigShareCount=%d, missingMembers=%s\n",
+ __func__, signHash.ToString(), oneSigShare.getId().ToString(),
+ oneSigShare.getMsgHash().ToString(), count, strMissingMembers);
} else {
- LogPrintLevel(BCLog::LLMQ_SIGS, BCLog::Level::Info, "CSigSharesManager::%s -- signing session timed out. signHash=%s, sigShareCount=%d\n", __func__,
- signHash.ToString(), count);
+ LogPrintLevel(BCLog::LLMQ_SIGS, BCLog::Level::Info, /* Continued */
+ "CSigSharesManager::%s -- signing session timed out. signHash=%s, sigShareCount=%d\n",
+ __func__, signHash.ToString(), count);
}
RemoveSigSharesForSession(signHash);
} |
UdjinM6
reviewed
Nov 20, 2024
…nes in the log file
…processor directive
`PrintLockContention` hasn't existed since dash#6046
UdjinM6
approved these changes
Nov 20, 2024
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
utACK f5231c18f160ca1e7762957a1bec92b003a60a01
src/util/system.cpp
Outdated
Member
There was a problem hiding this comment.
22766; don't understand why it's partial. Missing changes, appear to be able to be done
Collaborator
Author
…messages, reverse LogPrintLevel order Co-authored-by: UdjinM6 <[email protected]>
…tion WalletLogPrintf
…ogPrint-vs-LogPrintf section in dev notes
knst
approved these changes
Nov 25, 2024
| if (msg_type == NetMsgType::SENDTXRCNCL) { | ||
| if (!m_txreconciliation) { | ||
| LogPrint(BCLog::NET, "sendtxrcncl from peer=%d ignored, as our node does not have txreconciliation enabled\n", pfrom.GetId()); | ||
| LogPrintLevel(BCLog::NET, BCLog::Level::Debug, "sendtxrcncl from peer=%d ignored, as our node does not have txreconciliation enabled\n", pfrom.GetId()); |
Collaborator
There was a problem hiding this comment.
LogPrintLevel: nit: I think it's useful to specify in a commit message which exactly prior backports
5 tasks
PastaPastaPasta
added a commit
that referenced
this pull request
Dec 6, 2024
…ptCategory()` with `Debug` level dfe86b4 fix: follow-up fixes (UdjinM6) a254a7b refactor: sping LogAcceptCategory and LogAcceptDebug (Konstantin Akimov) 82238e6 refactor: Set log level in `LogAcceptCategory()` to `Debug` by default (UdjinM6) Pull request description: ## Issue being fixed or feature implemented #6399 introduced severity-based logging via b046e09. We use `LogAcceptCategory()` in quite a few places and it's always `BCLog::Level::Debug` so log level is kind of redundant for us and just makes it harder to read the code. ## What was done? ~Set log level in `LogAcceptCategory()` to `BCLog::Level::Debug` by default~. Introduce `LogAcceptDebug()` which is `LogAcceptCategory()` with `Debug` level. Simplify corresponding Dash-specific code. ## How Has This Been Tested? ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: utACK dfe86b4 Tree-SHA512: 167da533af088c4a3bfca22abd223a2314848ec79af10f117368f6d94a4a7faa3b009477a7af455ff890f8001622494c1e3a05112f9a7204321cc237278bf387
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
4 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.
Additional Information
LogPrintLevels from backports in dash#6333 that were changed toLogPrints as they were backported beforeLogPrintLevelwas backported.clang-formatsuggestions forLogPrintLevelhave to be ignored in order to prevent the linter from tripping due to a "missing newline" (build).SharedLockwas introduced in dash#5961 andPrintLockContentionwas removed in dash#6046 but the changes in the latter were not extended to the former. This has been corrected as part of this pull request.Breaking Changes
None expected.
Checklist