This repository has been archived by the owner on Oct 28, 2021. It is now read-only.
Add log channels to Aleth command-line help output #5564
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
Codecov Report
@@ Coverage Diff @@
## master #5564 +/- ##
==========================================
- Coverage 62.13% 62.09% -0.05%
==========================================
Files 347 347
Lines 28982 28995 +13
Branches 3284 3284
==========================================
- Hits 18009 18005 -4
- Misses 9796 9810 +14
- Partials 1177 1180 +3 |
|
@halfalicious @gumb0 Also for xcode there were a ton of warning messages "This was likely caused by different translation units being compiled with different visibility settings." for a long time now. I googled this and nothing serious came out of it. Thought I would let you know. |
|
@twinstar26 Can you also please add a change log entry? Look at recently merged PRs for examples. |
|
@halfalicious @gumb0 If everything looks good please let me know so that I can squash the commits. |
|
This is the improved output message. |
gumb0
suggested changes
Apr 15, 2019
There was a problem hiding this comment.
Instead of a separate function for this, I think this list of channels should be a part of --log-channels description.
So pass the list of channels to createLoggingProgramOptions and then add it to log-channels description after newline.
Kind of like
auto const logChannelsDescription = "Space-separated list of the log channels to show (default: show all channels).\n" + channelList;
addLoggingOption("log-channels",
po::value<std::vector<std::string>>(&_options.includeChannels)
->value_name("<channel_list>")
->multitoken(),
logChannelsDescription);
Then it will be formatted automatically I think.
|
@gumb0 @halfalicious So with this PR I have created overloaded function Output:- from aleth-main |
gumb0
suggested changes
Apr 16, 2019
aleth/main.cpp
Outdated
| @@ -202,6 +202,12 @@ int main(int argc, char** argv) | |||
| fs::path configPath; | |||
| string configJSON; | |||
|
|
|||
| ///List_logging_channels | |||
| const std::vector <string> list_log_channels = {"block", "blockhdr", "bq", "chain", "client", | |||
There was a problem hiding this comment.
I see channels like exec, vmtrace missing.
Search for all uses of Logger to find them.
There was a problem hiding this comment.
Done. I checked all the instances of Logger
gumb0
suggested changes
Apr 16, 2019
aleth/main.cpp
Outdated
| @@ -202,6 +202,9 @@ int main(int argc, char** argv) | |||
| fs::path configPath; | |||
| string configJSON; | |||
|
|
|||
| ///List_logging_channels | |||
| const std::string listLogChannels = "block blockhdr bq chain client debug discov error ethcap exec host impolite info net peer snap sync tq trace vmtrace warn watch"; | |||
There was a problem hiding this comment.
Suggested change
| const std::string listLogChannels = "block blockhdr bq chain client debug discov error ethcap exec host impolite info net peer snap sync tq trace vmtrace warn watch"; | |
| std::string const logChannels = "block blockhdr bq chain client debug discov error ethcap exec host impolite info net overlaydb peer rpc snap statedb sync timer tq trace vmtrace warn watch"; |
(some channels were also using clog(...) way to log, it was hard to find, sorry)
Also move this definition closer to where it's used (right before line 328)
libdevcore/LoggingProgramOptions.cpp
Outdated
| @@ -41,4 +41,27 @@ po::options_description createLoggingProgramOptions(unsigned _lineLength, Loggin | |||
| return optionsDescr; | |||
| } | |||
|
|
|||
| po::options_description createLoggingProgramOptions(unsigned _lineLength, LoggingOptions& _options, const std::string listLogChannels) | |||
There was a problem hiding this comment.
You don't need to duplicate the whole function, you need just this one version and make the last parameter optional.
Suggested change
| po::options_description createLoggingProgramOptions(unsigned _lineLength, LoggingOptions& _options, const std::string listLogChannels) | |
| po::options_description createLoggingProgramOptions(unsigned _lineLength, LoggingOptions& _options, std::string const& _logChannels = {}) |
|
Currently help looks like this |
gumb0
approved these changes
Apr 16, 2019
This pull request was closed.
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.
Fixes #5549