Skip to content

wallet: reduce unconditional logging during load #33299

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

Merged
merged 1 commit into from
Sep 30, 2025
Merged

wallet: reduce unconditional logging during load #33299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/wallet/load.cpp
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

nit: if you re-touch, same as walletdb.cpp, copyright dates needs to be updated...

Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ bool VerifyWallets(WalletContext& context)
}

LogInfo("Using wallet directory %s", fs::PathToString(GetWalletDir()));
// Print general DB information
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: the function name is informative enough imo, no need for docstring here

LogDBInfo();

chain.initMessage(_("Verifying wallet(s)…"));

Expand Down
3 changes: 0 additions & 3 deletions src/wallet/sqlite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ SQLiteDatabase::SQLiteDatabase(const fs::path& dir_path, const fs::path& file_pa
{
{
LOCK(g_sqlite_mutex);
LogInfo("Using SQLite Version %s", SQLiteDatabaseVersion());
LogInfo("Using wallet %s", fs::PathToString(m_dir_path));

if (++g_sqlite_count == 1) {
// Setup logging
int ret = sqlite3_config(SQLITE_CONFIG_LOG, ErrorLogCallback, nullptr);
Expand Down
6 changes: 6 additions & 0 deletions src/wallet/walletdb.cpp
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

nit: if you re-touch... please update the copyright (also to match its header walletdb.h)
// Copyright (c) 2009-present The Bitcoin Core developers

Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ const std::string WATCHS{"watchs"};
const std::unordered_set<std::string> LEGACY_TYPES{CRYPTED_KEY, CSCRIPT, DEFAULTKEY, HDCHAIN, KEYMETA, KEY, OLD_KEY, POOL, WATCHMETA, WATCHS};
} // namespace DBKeys

void LogDBInfo()
{
// Add useful DB information here. This will be printed during startup.
LogInfo("Using SQLite Version %s", SQLiteDatabaseVersion());
}

//
// WalletBatch
//
Expand Down
3 changes: 3 additions & 0 deletions src/wallet/walletdb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ class CWallet;
class CWalletTx;
struct WalletContext;

// Logs information about the database, including available engines, features, and other capabilities
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: docstring doesn't correspond to what's actually being printed. To avoid it going stale quickly, how about a simple:

// Logs information about the database(s) used by the wallet.

void LogDBInfo();

/**
* Overview of wallet database classes:
*
Expand Down
Loading