Skip to content

Commit 4c1d263

Browse files
committed
scripted-diff: Change BCLog::DB to BCLog::WALLETDB
-BEGIN VERIFY SCRIPT- git grep -l "BCLog::DB" src | xargs sed -i "s/BCLog::DB/BCLog::WALLETDB/g" sed -i "s/DB =/WALLETDB =/g" src/logging.h -END VERIFY SCRIPT-
1 parent 6b42b3b commit 4c1d263

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/logging.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ bool BCLog::Logger::EnableCategory(const std::string& str)
9999
if (str == "db") {
100100
// DEPRECATION: Added in 0.20, should start returning an error in 0.21
101101
LogPrintf("Warning: logging category 'db' is deprecated, use 'walletdb' instead\n");
102-
EnableCategory(BCLog::DB);
102+
EnableCategory(BCLog::WALLETDB);
103103
return true;
104104
}
105105
return false;
@@ -147,7 +147,7 @@ const CLogCategoryDesc LogCategories[] =
147147
{BCLog::HTTP, "http"},
148148
{BCLog::BENCH, "bench"},
149149
{BCLog::ZMQ, "zmq"},
150-
{BCLog::DB, "walletdb"},
150+
{BCLog::WALLETDB, "walletdb"},
151151
{BCLog::RPC, "rpc"},
152152
{BCLog::ESTIMATEFEE, "estimatefee"},
153153
{BCLog::ADDRMAN, "addrman"},

src/logging.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace BCLog {
3939
HTTP = (1 << 3),
4040
BENCH = (1 << 4),
4141
ZMQ = (1 << 5),
42-
DB = (1 << 6),
42+
WALLETDB = (1 << 6),
4343
RPC = (1 << 7),
4444
ESTIMATEFEE = (1 << 8),
4545
ADDRMAN = (1 << 9),

src/wallet/db.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ BerkeleyEnvironment::BerkeleyEnvironment()
242242
{
243243
Reset();
244244

245-
LogPrint(BCLog::DB, "BerkeleyEnvironment::MakeMock\n");
245+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::MakeMock\n");
246246

247247
dbenv->set_cachesize(1, 0, 1);
248248
dbenv->set_lg_bsize(10485760 * 4);
@@ -765,7 +765,7 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
765765
{
766766
int64_t nStart = GetTimeMillis();
767767
// Flush log data to the actual data file on all files that are not in use
768-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: [%s] Flush(%s)%s\n", strPath, fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started");
768+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: [%s] Flush(%s)%s\n", strPath, fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started");
769769
if (!fDbEnvInit)
770770
return;
771771
{
@@ -774,21 +774,21 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
774774
while (mi != mapFileUseCount.end()) {
775775
std::string strFile = (*mi).first;
776776
int nRefCount = (*mi).second;
777-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: Flushing %s (refcount = %d)...\n", strFile, nRefCount);
777+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: Flushing %s (refcount = %d)...\n", strFile, nRefCount);
778778
if (nRefCount == 0) {
779779
// Move log data to the dat file
780780
CloseDb(strFile);
781-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: %s checkpoint\n", strFile);
781+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: %s checkpoint\n", strFile);
782782
dbenv->txn_checkpoint(0, 0, 0);
783-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: %s detach\n", strFile);
783+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: %s detach\n", strFile);
784784
if (!fMockDb)
785785
dbenv->lsn_reset(strFile.c_str(), 0);
786-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: %s closed\n", strFile);
786+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: %s closed\n", strFile);
787787
mapFileUseCount.erase(mi++);
788788
} else
789789
mi++;
790790
}
791-
LogPrint(BCLog::DB, "BerkeleyEnvironment::Flush: Flush(%s)%s took %15dms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started", GetTimeMillis() - nStart);
791+
LogPrint(BCLog::WALLETDB, "BerkeleyEnvironment::Flush: Flush(%s)%s took %15dms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started", GetTimeMillis() - nStart);
792792
if (fShutdown) {
793793
char** listp;
794794
if (mapFileUseCount.empty()) {
@@ -828,15 +828,15 @@ bool BerkeleyBatch::PeriodicFlush(BerkeleyDatabase& database)
828828
std::map<std::string, int>::iterator mi = env->mapFileUseCount.find(strFile);
829829
if (mi != env->mapFileUseCount.end())
830830
{
831-
LogPrint(BCLog::DB, "Flushing %s\n", strFile);
831+
LogPrint(BCLog::WALLETDB, "Flushing %s\n", strFile);
832832
int64_t nStart = GetTimeMillis();
833833

834834
// Flush wallet file so it's self contained
835835
env->CloseDb(strFile);
836836
env->CheckpointLSN(strFile);
837837

838838
env->mapFileUseCount.erase(mi++);
839-
LogPrint(BCLog::DB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
839+
LogPrint(BCLog::WALLETDB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
840840
ret = true;
841841
}
842842
}

src/wallet/walletdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ DBErrors WalletBatch::ZapSelectTx(std::vector<uint256>& vTxHashIn, std::vector<u
629629
}
630630
else if ((*it) == hash) {
631631
if(!EraseTx(hash)) {
632-
LogPrint(BCLog::DB, "Transaction was found for deletion but returned database error: %s\n", hash.GetHex());
632+
LogPrint(BCLog::WALLETDB, "Transaction was found for deletion but returned database error: %s\n", hash.GetHex());
633633
delerror = true;
634634
}
635635
vTxHashOut.push_back(hash);

0 commit comments

Comments
 (0)