Skip to content

Conversation

jonatack
Copy link
Member

@jonatack jonatack commented Jun 6, 2022

This is the first commit from #25203.

  • Scripted-diff: de-duplicate logging category output for the tor, i2p, net, zmq, and prune messages (e.g. where I found duplicates), as these category prefixes are now printed automatically since logging: Add severity level to logs #24464

examples before

[tor] tor: Successfully connected!
[i2p] I2P: Creating SAM session with 127.0.0.1:7656
[zmq] zmq: Initialize notification interface
[net] net: enabling extra block-relay-only peers

after

[tor] Successfully connected!
[i2p] Creating SAM session with 127.0.0.1:7656
[zmq] Initialize notification interface
[net] enabling extra block-relay-only peers

-BEGIN VERIFY SCRIPT-
s() { git grep -l "$1" src | xargs sed -i "s/$1/$2/g"; }
s 'BCLog::TOR, "tor: '       'BCLog::TOR, "'
s 'BCLog::I2P, "I2P: '       'BCLog::I2P, "'
s 'BCLog::NET, "net: '       'BCLog::NET, "'
s 'BCLog::ZMQ, "zmq: '       'BCLog::ZMQ, "'
s 'BCLog::PRUNE, "Prune: '   'BCLog::PRUNE, "'
-END VERIFY SCRIPT-
@klementtan
Copy link
Contributor

crACK d40550d

Manually verified that the script correctly remove duplicate categories from LogPrint output

@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 7, 2022

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #25203 (logging: update to severity-based logging by jonatack)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@maflcko
Copy link
Member

maflcko commented Jun 7, 2022

cr ACK d40550d

@maflcko maflcko merged commit 45d8b1e into bitcoin:master Jun 7, 2022
@jonatack jonatack deleted the remove-duplicate-categories-from-LogPrint-output branch June 7, 2022 11:06
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 8, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Jun 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants