mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-05 05:14:51 +02:00
Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging
e60fc7d5d3logging: Replace uses of LogPrintfCategory (Anthony Towns)f7ce5ac08clogging: add LogError, LogWarning, LogInfo, LogDebug, LogTrace (Anthony Towns)fbd7642c8elogging: add -loglevelalways=1 option (Anthony Towns)782bb6a056logging: treat BCLog::ALL like BCLog::NONE (Anthony Towns)667ce3e329logging: Drop BCLog::Level::None (Anthony Towns)ab34dc6012logging: Log Info messages unconditionally (Anthony Towns)dfe98b6874logging: make [cat:debug] and [info] implicit (Anthony Towns)c5c76dc615logging: refactor: pull prefix code out (Anthony Towns) Pull request description: Replace `LogPrint*` functions with severity based logging functions: * `LogInfo(...)`, `LogWarning(...)`, `LogError(...)` for unconditional (uncategorised) logging (replaces `LogPrintf`) * `LogDebug(CATEGORY, ...)` and `LogTrace(CATEGORY, ...)` for conditional logging (replaces `LogPrint`) * `LogPrintLevel(CATEGORY, LEVEL, ...)` for when the level isn't known in advance, or a category needs to be added for an info/warning/error log message (mostly unchanged, but rarely needed) Logs look roughly as they do now with `LogInfo` not having an `[info]` prefix, and `LogDebug` having a `[cat]` prefix, rather than a `[cat:debug]` prefix. This removes `BCLog::Level::None` entirely -- for `LogFlags::NONE` just use `Level::Info`, for any actual category, use `Level::Debug`. Adds docs to developer-notes about when to use which level. Adds `-loglevelalways=1` option so that you get `[net:debug]`, `[all:info]`, `[all:warning]` etc, which might be helpful for automated parsing, or just if you like everything to be consistent. Defaults to off to reduce noise in the default config, and to avoid unnecessary changes on upgrades. Changes the behaviour of `LogPrintLevel(CATEGORY, BCLog::Level::Info, ...)` to be logged unconditionally, rather than only being an additional optional logging level in addition to trace and debug. Does not change the behaviour of `LogPrintLevel(NONE, Debug, ...)` and `LogPrintLevel(NONE, Trace, ...)` being no-ops. ACKs for top commit: maflcko: re-ACKe60fc7d5d3🌚 achow101: ACKe60fc7d5d3stickies-v: ACKe60fc7d5d3jamesob: ACKe60fc7d5d3([`jamesob/ackr/28318.1.ajtowns.logging_simplify_api_for`](https://github.com/jamesob/bitcoin/tree/ackr/28318.1.ajtowns.logging_simplify_api_for)) Tree-SHA512: e7a4588779b148242495b7b6f64198a00c314cd57100affab11c43e9d39c9bbf85118ee2002792087fdcffdea08c84576e20844b3079f27083e26ddd7ca15d7f
This commit is contained in:
@@ -725,6 +725,47 @@ General Bitcoin Core
|
||||
- *Explanation*: If the test suite is to be updated for a change, this has to
|
||||
be done first.
|
||||
|
||||
Logging
|
||||
-------
|
||||
|
||||
The macros `LogInfo`, `LogDebug`, `LogTrace`, `LogWarning` and `LogError` are available for
|
||||
logging messages. They should be used as follows:
|
||||
|
||||
- `LogDebug(BCLog::CATEGORY, fmt, params...)` is what you want
|
||||
most of the time, and it should be used for log messages that are
|
||||
useful for debugging and can reasonably be enabled on a production
|
||||
system (that has sufficient free storage space). They will be logged
|
||||
if the program is started with `-debug=category` or `-debug=1`.
|
||||
Note that `LogPrint(BCLog::CATEGORY, fmt, params...)` is a deprecated
|
||||
alias for `LogDebug`.
|
||||
|
||||
- `LogInfo(fmt, params...)` should only be used rarely, eg for startup
|
||||
messages or for infrequent and important events such as a new block tip
|
||||
being found or a new outbound connection being made. These log messages
|
||||
are unconditional so care must be taken that they can't be used by an
|
||||
attacker to fill up storage. Note that `LogPrintf(fmt, params...)` is
|
||||
a deprecated alias for `LogInfo`.
|
||||
|
||||
- `LogError(fmt, params...)` should be used in place of `LogInfo` for
|
||||
severe problems that require the node (or a subsystem) to shut down
|
||||
entirely (eg, insufficient storage space).
|
||||
|
||||
- `LogWarning(fmt, params...)` should be used in place of `LogInfo` for
|
||||
severe problems that the node admin should address, but are not
|
||||
severe enough to warrant shutting down the node (eg, system time
|
||||
appears to be wrong, unknown soft fork appears to have activated).
|
||||
|
||||
- `LogTrace(BCLog::CATEGORY, fmt, params...) should be used in place of
|
||||
`LogDebug` for log messages that would be unusable on a production
|
||||
system, eg due to being too noisy in normal use, or too resource
|
||||
intensive to process. These will be logged if the startup
|
||||
options `-debug=category -loglevel=category:trace` or `-debug=1
|
||||
-loglevel=trace` are selected.
|
||||
|
||||
Note that the format strings and parameters of `LogDebug` and `LogTrace`
|
||||
are only evaluated if the logging category is enabled, so you must be
|
||||
careful to avoid side-effects in those expressions.
|
||||
|
||||
Wallet
|
||||
-------
|
||||
|
||||
@@ -887,7 +928,7 @@ Strings and formatting
|
||||
`wcstoll`, `wcstombs`, `wcstoul`, `wcstoull`, `wcstoumax`, `wcswidth`,
|
||||
`wcsxfrm`, `wctob`, `wctomb`, `wctrans`, `wctype`, `wcwidth`, `wprintf`
|
||||
|
||||
- For `strprintf`, `LogPrint`, `LogPrintf` formatting characters don't need size specifiers.
|
||||
- For `strprintf`, `LogInfo`, `LogDebug`, etc formatting characters don't need size specifiers.
|
||||
|
||||
- *Rationale*: Bitcoin Core uses tinyformat, which is type safe. Leave them out to avoid confusion.
|
||||
|
||||
@@ -899,7 +940,7 @@ Strings and formatting
|
||||
|
||||
- *Rationale*: Although this is guaranteed to be safe starting with C++11, `.data()` communicates the intent better.
|
||||
|
||||
- Do not use it when passing strings to `tfm::format`, `strprintf`, `LogPrint[f]`.
|
||||
- Do not use it when passing strings to `tfm::format`, `strprintf`, `LogInfo`, `LogDebug`, etc.
|
||||
|
||||
- *Rationale*: This is redundant. Tinyformat handles strings.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user