From 4c0c89307dabbf51a32551471c54966ddf7c5bc3 Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Sun, 7 Jun 2020 16:57:18 +0200 Subject: [PATCH 1/2] log: remove deprecated `db` log category --- src/logging.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/logging.cpp b/src/logging.cpp index fe58ae9e73e..35e0754f205 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -95,15 +95,7 @@ void BCLog::Logger::EnableCategory(BCLog::LogFlags flag) bool BCLog::Logger::EnableCategory(const std::string& str) { BCLog::LogFlags flag; - if (!GetLogCategory(flag, str)) { - if (str == "db") { - // DEPRECATION: Added in 0.20, should start returning an error in 0.21 - LogPrintf("Warning: logging category 'db' is deprecated, use 'walletdb' instead\n"); - EnableCategory(BCLog::WALLETDB); - return true; - } - return false; - } + if (!GetLogCategory(flag, str)) return false; EnableCategory(flag); return true; } From c514a4f59a7430f05dbe20465ddf4ca323329f1e Mon Sep 17 00:00:00 2001 From: Jon Atack Date: Sun, 7 Jun 2020 17:33:25 +0200 Subject: [PATCH 2/2] doc: release note for `db` log category removal --- doc/release-notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/release-notes.md b/doc/release-notes.md index 80c385a471c..d9d0ecd6317 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -94,6 +94,9 @@ Build System Updated settings ---------------- +- The `-debug=db` logging category, which was deprecated in 0.20 and replaced by + `-debug=walletdb` to distinguish it from `coindb`, has been removed. (#19202) + Changes to Wallet or GUI related settings can be found in the GUI or Wallet section below. New settings