Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Util] LogAcceptCategory: use uint32_t rather than sets of strings #1437

Merged
merged 1 commit into from
Apr 1, 2020
Merged

[Util] LogAcceptCategory: use uint32_t rather than sets of strings #1437

merged 1 commit into from
Apr 1, 2020

Conversation

random-zebra
Copy link

@random-zebra random-zebra commented Mar 20, 2020 •
edited by Fuzzbawls
Loading

implemented on top of:

from bitcoin#9424

This changes the logging categories to boolean flags instead of strings.
This simplifies the acceptance testing by avoiding accessing a scoped static thread local pointer to a thread local set of strings. It eliminates the only use of boost::thread_specific_ptr outside of lockorder debugging.
This change allows log entries to be directed to multiple categories and makes it easy to change the logging flags at runtime (e.g. via an RPC, though that isn't done by this commit.)
It also eliminates the fDebug global.
Configuration of unknown logging categories now produces a warning.

We add 4 more debug categories:

  • BCLog::STAKING
  • BCLog::MASTERNODE (which includes previous "masternode" and "mnpayments" categories)
  • BCLog::MNBUDGET
  • BCLog::LEGACYZC

@random-zebra random-zebra added this to the 4.1.0 milestone Mar 20, 2020
@random-zebra random-zebra self-assigned this Mar 20, 2020
@random-zebra random-zebra mentioned this pull request Mar 20, 2020
Merged
2 tasks
@random-zebra
Copy link
Author

Rebased.

@random-zebra
Copy link
Author

Rebased on top of #1449

@random-zebra random-zebra changed the title [Core] LogAcceptCategory: use uint32_t rather than sets of strings [Util] LogAcceptCategory: use uint32_t rather than sets of strings Mar 23, 2020
This was referenced Mar 23, 2020
Merged
Merged
Merged
Merged
@furszy
Copy link

furszy commented Mar 27, 2020

Needs rebase

@random-zebra
Copy link
Author

Rebased - #1449 merged.

@random-zebra random-zebra requested review from Fuzzbawls and furszy and removed request for Fuzzbawls March 27, 2020 22:00
furszy
furszy reviewed Mar 30, 2020
View reviewed changes
src/timedata.cpp Outdated Show resolved Hide resolved
furszy
furszy previously approved these changes Mar 30, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side from the minor comment, nice work.

ACK 94dfd48 .

@random-zebra
Copy link
Author

Since I have to rabase this anyway (due to merge of #1467), will re-add (logCategories != BCLog::NONE) there for now.

@random-zebra random-zebra force-pushed the 2020_LogAcceptCategory branch 2 times, most recently from ef60391 to 1f45848 Compare March 31, 2020 08:40
@random-zebra
Copy link
Author

Rebased. Let's get this merged.

furszy
furszy previously approved these changes Apr 1, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re ACKing after rebase, 1f45848

@random-zebra
Copy link
Author

Rebased. Again.

Fuzzbawls
Fuzzbawls approved these changes Apr 1, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK c3dc816

@furszy furszy merged commit 8a6f514 into PIVX-Project:master Apr 1, 2020
random-zebra added a commit that referenced this pull request Apr 4, 2020
@random-zebra
Merge #1439: [Core] Add -debugexclude option
eb1ed66 
0a85445 [Core] Add -debugexclude option (random-zebra)

Pull request description:

  Implemented on top of:
  - [x] #1449
  - [x] #1437

  Backports bitcoin#10123

  > setting `-debug` can lead to very noisy debug.logs with subcomponents filling up the log file. See for example https://travis-ci.org/bitcoin/bitcoin/jobs/216767286 where there are hundreds of libevent debug logs.

  This commit adds an option to exclude certain components from debug logging. The usage is:
  ```
  pivxd -debug -debugexclude=<component1> -debugexclude=<component2> ...
  ```

  This finally reduces spammy logs in the functional tests debug, due to libevent and leveldb (bitcoin#10124 was already included backporting the test suite).

ACKs for top commit:
  furszy:
    Code looking good, utACK 0a85445 .
  Fuzzbawls:
    ACK 0a85445

Tree-SHA512: 6ccbe275ab11f3e1739ed117e49db0a2e56db345287cddc7cc18fc1131d7800d0f08a7e93005f70cf45ed8e340580f91c3017532bd2ea28fedb5735409ae068b
Fuzzbawls added a commit that referenced this pull request Apr 6, 2020
@Fuzzbawls
Merge #1450: [Util] Buffer log messages and explicitly open logs
cb6d15a 
d16b7b2 Buffer log messages and explicitly open logs (random-zebra)

Pull request description:

  implemented on top of
  - [x] #1449
  - [x] #1437
  - [x] #1439

  Backports bitcoin#6149

  > Prevents stomping on debug logs in datadirs that are locked by other
  instances and lost parameter interaction messages that can get wiped by
  ShrinkDebugFile().
  The log is now opened explicitly and all emitted messages are buffered
  until this open occurs.  The version message and log cut have also been
  moved to the earliest possible sensible location.

ACKs for top commit:
  furszy:
    utACK d16b7b2
  Fuzzbawls:
    ACK d16b7b2

Tree-SHA512: f3f859181499661641df1ccf118fdb583517c3f4104313df4c200471436e2c456bd9d15164215cfde274b235afdd2afe19a186c214d3c06461f0e3a03bd944b8
random-zebra added a commit that referenced this pull request Apr 6, 2020
@random-zebra
Merge #1451: [RPC] Add logging RPC
1fa5156 
f66e50e [Doc] Add logging RPC to release notes (random-zebra)
bf55911 allow libevent logging to be updated during runtime (random-zebra)
ec43b51 Set BCLog::LIBEVENT correctly for old libevent versions. (random-zebra)
cbaf724 [rpc] Add logging rpc (random-zebra)

Pull request description:

  Implemented on top of:
  - [x] #1449
  - [x] #1437
  - [x] #1439
  - [x] #1450

  Backports bitcoin#10150

  > Adds an RPC to get/set active logging categories.
  First commit allows all categories except libevent to be reconfigured during runtime.
  Second commit modifies InitHTTPServer() to allow leveldb logging to be reconfigured during runtime.

ACKs for top commit:
  furszy:
    Really nice 👍 , ACK f66e50e .
  Fuzzbawls:
    ACK f66e50e

Tree-SHA512: 7b735628d341fb8661eb76f57dadc78e69ea63c62edb778450b3d9e3b7137ce06e08ceab835967b923401a9687e5b2605722a9f256e6ed85fc372a0e46086b8f
random-zebra added a commit that referenced this pull request Apr 9, 2020
@random-zebra
Merge #1455: [Init] Add -debuglogfile option
b26dbc4 
882ef90 [Doc] Update release notes for `-debuglogfile` (random-zebra)
3d5ad7f test: Add tests for `-debuglogfile` with subdirs (random-zebra)
2c2e36d test: Add test for `-debuglogfile` (random-zebra)
b44a324 Add `-debuglogfile` option (random-zebra)

Pull request description:

  Implemented on top of
  - [x] #1449
  - [x] #1437
  - [x] #1439
  - [x] #1450
  - [x] #1451

  Only last 4 commits are relevant to this PR.
  Backports bitcoin#11781

  > This patch adds an option to configure the name and/or directory of the debug log file.</br></br>
  The user can specify either a relative path, in which case the path is relative to the (network specific) data directory. They can also specify an absolute path to put the log anywhere else in the file system.

  Functional test included.

ACKs for top commit:
  Fuzzbawls:
    ACK 882ef90
  furszy:
    utACK 882ef90

Tree-SHA512: 02a0e6487683e5111765af7296ef7ce035372febf037268d99d29b4c4a2f74bcc40f46a0f5b1bacddc2249c2a7e40255555e83ca9d51bf71d9e054c6e85765cc
Fuzzbawls added a commit that referenced this pull request Apr 14, 2020
@Fuzzbawls
Merge #1459: [Util] Refactor logging code into a global object
c94f241 
5c8e968 [Trivial] Document logtimemicros flag in the help (random-zebra)
4daa10a util: Store debug log file path in BCLog::Logger member. (random-zebra)
2f03e85 scripted-diff: Rename BCLog::Logger member variables. (random-zebra)
303700e util: Refactor GetLogCategory. (random-zebra)
0ae18c0 util: Encapsulate logCategories within BCLog::Logger. (random-zebra)
a2fb3fd util: Move debug file management functions into Logger. (random-zebra)
5a42d82 util: Establish global logger object. (random-zebra)
15c0da4 [Refactor] Complete boost::filesystem namespace in util (random-zebra)
81ddbf4 MOVEONLY: Move logging code from util.{h,cpp} to new files. (random-zebra)

Pull request description:

  Implemented on top of:
  - [x] #1449
  - [x] #1437
  - [x] #1439
  - [x] #1450
  - [x] #1451
  - [x] #1455

  This creates a new class BCLog::Logger to encapsulate all global logging configuration and state.

  Adapted from
  - bitcoin#13021
  - bitcoin#12954

ACKs for top commit:
  Fuzzbawls:
    ACK 5c8e968
  furszy:
    utACK 5c8e968

Tree-SHA512: 0b10a031dd7e32b48485236fbdd8249d011049e6f99e1df145b7dea4cab9e6e67e19d1bb13ff48e99eb2487a8399bbb8298fe851ad8873416fc1053aee0379bc
@random-zebra random-zebra deleted the 2020_LogAcceptCategory branch September 24, 2020 00:28
This was referenced Sep 28, 2021
Merged
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fuzzbawls Fuzzbawls Fuzzbawls approved these changes

@furszy furszy furszy left review comments

Assignees

@random-zebra random-zebra

Labels
Refactoring Upstream Util / log / libs
Projects
None yet
Milestone
4.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@random-zebra @furszy @Fuzzbawls