This repository was archived by the owner on Apr 24, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Provide more granular control of logging options #1544
Merged
Merged
+46
−37
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
The verbosity level was intended to indicate severity of a log entry. Over time we've used it inappropriately to enable various log options. This has led us to a situation where it is impossible to enable some options without also enabling others. This changes the global verbosity setting to be a set of bits, each indicating if a log feature is enabled. The following choices are defined and spelled out in the help. #define LOG_SWITCH_TIME 1 #define LOG_JSON 2 #define LOG_PER_GPU 4 #define LOG_DEBUG 8
dd7f9db
to
d58ef27
Compare
libdevcore/Log.h
Outdated
#define LOG_JSON 2 | ||
#define LOG_PER_GPU 4 | ||
#define LOG_DEBUG 8 | ||
extern int g_logOptions; |
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.
Add
# define LOG_MAX (LOG_SWITCH_TIME|LOG_JSON|LOG_PER_GPU|LOG_DEBUG)
StefanOberhumer
suggested changes
Sep 5, 2018
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.
Use LOG_MAX to validate range also in ApiServer.cpp:
ethminer/libapicore/ApiServer.cpp
Line 689 in 032db8a
if (verbosity > 9) |
Document change in CHANGELOG.md |
ethminer/main.cpp
Outdated
->group(CommonGroup) | ||
->check(CLI::Range(9)); | ||
->check(CLI::Range(15)); |
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.
Use LOG_MAX to validate range
StefanOberhumer
approved these changes
Sep 5, 2018
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.
The verbosity level was intended to indicate severity of
a log entry. Over time we've used it inappropriately to
enable various log options. This has led us to a situation
where it is impossible to enable some options without
also enabling others.
This changes the global verbosity setting to be a set of
bits, each indicating if a log feature is enabled.
The following choices are defined and spelled out in the
help.
#define LOG_SWITCH_TIME 1
#define LOG_JSON 2
#define LOG_PER_GPU 4
#define LOG_DEBUG 8
Any combination of the sum of these options (0-15) is allowed.