log: Use Join() helper when listing log categories #18669

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2004-logJoin changing 4 files +17 −31

MarcoFalke commented at 3:14 PM on April 16, 2020: member

This removes the global ListLogCategories and replaces it with a one-line member function LogCategoriesString, which just calls Join.

Should be a straightforward refactor to get rid of a few LOC.
log: Use Join() helper when listing log categories faec063887
MarcoFalke added the label Refactoring on Apr 16, 2020

MarcoFalke commented at 3:30 PM on April 16, 2020: member

Rendered diff (nothing changes except commit hash):

@@ -1,4 +1,4 @@
-Bitcoin Core version v0.20.99.0-79b0459648
+Bitcoin Core version v0.20.99.0-faec063887
 
 Usage:  bitcoin-qt [command-line options]

DrahtBot commented at 8:00 PM on April 16, 2020: member



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

No conflicts as of last run.
hebasto commented at 1:00 AM on April 22, 2020: member

Concept ACK.
laanwj commented at 12:29 PM on April 22, 2020: member

ACK faec0638872798b58b9882ee079014555bc8393e
in src/logging.h:138 in faec063887
```
 131 | @@ -132,6 +132,13 @@ namespace BCLog {
 132 |          bool DisableCategory(const std::string& str);
 133 |  
 134 |          bool WillLogCategory(LogFlags category) const;
 135 | +        /** Returns a vector of the log categories */
 136 | +        std::vector<LogCategory> LogCategoriesList();
 137 | +        /** Returns a string with the log categories */
 138 | +        std::string LogCategoriesString()
```
laanwj commented at 12:30 PM on April 22, 2020:

Moving the implementation to logging.cpp could avoid adding the compile-time dependency on util/string.h here.

MarcoFalke commented at 12:38 PM on April 22, 2020:

util/string.h is relatively trivial to parse for a compiler, compared to serialize.h or the boost fs.h, so I thought it could be ok to include it here.

Happy to change though. You gave it an ACK, so let me know if I should invalidate that.
promag commented at 11:47 PM on April 26, 2020: member

ACK faec0638872798b58b9882ee079014555bc8393e, I also think it's fine as it is (re #18669 (review)).
MarcoFalke merged this on Apr 26, 2020
MarcoFalke closed this on Apr 26, 2020
MarcoFalke deleted the branch on Apr 26, 2020
sidhujag referenced this in commit f0c1aa42b9 on Apr 27, 2020
Fabcien referenced this in commit f9ec355922 on Jan 21, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

log: Use Join() helper when listing log categories #18669

Conflicts