-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
backport: merge bitcoin#23235, #23104, #24770, #24830, #24464, #24757, #25202, #25217, #25292, #25614, partial bitcoin#22766 (logging backports) #6399
Conversation
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);
} |
…nes in the log file
…processor directive
`PrintLockContention` hasn't existed since dash#6046
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK f5231c1
@@ -79,6 +79,7 @@ | |||
#include <fstream> | |||
#include <map> | |||
#include <memory> | |||
#include <optional> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
22766; don't understand why it's partial. Missing changes, appear to be able to be done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…messages, reverse LogPrintLevel order Co-authored-by: UdjinM6 <[email protected]>
…tion WalletLogPrintf
…ogPrint-vs-LogPrintf section in dev notes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 1621696
@@ -3763,19 +3763,19 @@ void PeerManagerImpl::ProcessMessage( | |||
// from switching announcement protocols after the connection is up. | |||
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()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LogPrintLevel
: nit: I think it's useful to specify in a commit message which exactly prior backports
Additional Information
LogPrintLevel
s from backports in dash#6333 that were changed toLogPrint
s as they were backported beforeLogPrintLevel
was backported.Resolved by applying diff (source).clang-format
suggestions forLogPrintLevel
have to be ignored in order to prevent the linter from tripping due to a "missing newline" (build).SharedLock
was introduced in dash#5961 andPrintLockContention
was 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