Fix ZMQ docs - Improve logging #7058
Merged
Conversation
This file contains 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
dcousens
changed the title
dcousens
changed the title
dcousens
changed the title
| @@ -72,7 +72,7 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const | |||
| // Called at startup to conditionally set up ZMQ socket(s) | |||
| bool CZMQNotificationInterface::Initialize() | |||
| { | |||
| LogPrint("zmq", "Initialize notification interface\n"); | |||
| LogPrint("zmq", "zmq: Initialize notification interface\n"); | |||
There was a problem hiding this comment.
@laanwj maybe this should be done by LogPrint? Automatically prepend the category to the message?
Thoughts?
There was a problem hiding this comment.
Right, this could be done by LogPrint (autoprint the category). But until then, it is probably best if we keep it consistent with other LogPrint's.
There was a problem hiding this comment.
Agree to get this done in the LogPrint method.
|
@dcousens No worries. utACK. |
|
Nice catch with the wrong help message! |
|
Anything holding this up @laanwj ? |
|
utACK ffacd27 |
laanwj
added a commit
that referenced
this pull request
Nov 27, 2015
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 1, 2015
Github-Pull: bitcoin#7058 Rebased-From: cdcd816
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 1, 2015
Github-Pull: bitcoin#7058 Rebased-From: 14075b1
luke-jr
pushed a commit
to luke-jr/bitcoin
that referenced
this pull request
Dec 1, 2015
Github-Pull: bitcoin#7058 Rebased-From: ffacd27
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Feb 9, 2017
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Feb 9, 2017
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR fixes the
-zmq*flags (in-h) to coincide with what they actually are in the code and the docs.It also prepends the logging messages for zmq with
zmq:, and adds it to the debug categories in-h.Docs reference: https://github.com/bitcoin/bitcoin/blob/master/doc/zmq.md#usage
Code reference: https://github.com/bitcoin/bitcoin/blob/master/src/zmq/zmqnotificationinterface.cpp#L38-L41