diff --git a/src/logging.h b/src/logging.h --- a/src/logging.h +++ b/src/logging.h @@ -32,7 +32,7 @@ HTTP = (1 << 3), BENCH = (1 << 4), ZMQ = (1 << 5), - DB = (1 << 6), + WALLETDB = (1 << 6), RPC = (1 << 7), ESTIMATEFEE = (1 << 8), ADDRMAN = (1 << 9), diff --git a/src/logging.cpp b/src/logging.cpp --- a/src/logging.cpp +++ b/src/logging.cpp @@ -63,7 +63,7 @@ {BCLog::HTTP, "http"}, {BCLog::BENCH, "bench"}, {BCLog::ZMQ, "zmq"}, - {BCLog::DB, "db"}, + {BCLog::WALLETDB, "walletdb"}, {BCLog::RPC, "rpc"}, {BCLog::ESTIMATEFEE, "estimatefee"}, {BCLog::ADDRMAN, "addrman"}, diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -35,7 +35,7 @@ fDbEnvInit = false; int ret = dbenv->close(0); if (ret != 0) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::EnvShutdown: Error %d shutting down database " "environment: %s\n", ret, DbEnv::strerror(ret)); @@ -78,7 +78,7 @@ fs::path pathLogDir = pathIn / "database"; TryCreateDirectories(pathLogDir); fs::path pathErrorFile = pathIn / "db.log"; - LogPrint(BCLog::DB, "CDBEnv::Open: LogDir=%s ErrorFile=%s\n", + LogPrint(BCLog::WALLETDB, "CDBEnv::Open: LogDir=%s ErrorFile=%s\n", pathLogDir.string(), pathErrorFile.string()); unsigned int nEnvFlags = 0; @@ -121,7 +121,7 @@ boost::this_thread::interruption_point(); - LogPrint(BCLog::DB, "CDBEnv::MakeMock\n"); + LogPrint(BCLog::WALLETDB, "CDBEnv::MakeMock\n"); dbenv->set_cachesize(1, 0, 1); dbenv->set_lg_bsize(10485760 * 4); @@ -179,9 +179,9 @@ int result = bitdb.dbenv->dbrename(nullptr, filename.c_str(), nullptr, newFilename.c_str(), DB_AUTO_COMMIT); if (result == 0) { - LogPrint(BCLog::DB, "Renamed %s to %s\n", filename, newFilename); + LogPrint(BCLog::WALLETDB, "Renamed %s to %s\n", filename, newFilename); } else { - LogPrint(BCLog::DB, "Failed to rename %s to %s\n", filename, + LogPrint(BCLog::WALLETDB, "Failed to rename %s to %s\n", filename, newFilename); return false; } @@ -189,11 +189,11 @@ std::vector salvagedData; bool fSuccess = bitdb.Salvage(newFilename, true, salvagedData); if (salvagedData.empty()) { - LogPrint(BCLog::DB, "Salvage(aggressive) found no records in %s.\n", - newFilename); + LogPrint(BCLog::WALLETDB, + "Salvage(aggressive) found no records in %s.\n", newFilename); return false; } - LogPrint(BCLog::DB, "Salvage(aggressive) found %u records\n", + LogPrint(BCLog::WALLETDB, "Salvage(aggressive) found %u records\n", salvagedData.size()); std::unique_ptr pdbCopy(new Db(bitdb.dbenv, 0)); @@ -204,7 +204,7 @@ DB_CREATE, // Flags 0); if (ret > 0) { - LogPrint(BCLog::DB, "Cannot create database file %s\n", filename); + LogPrint(BCLog::WALLETDB, "Cannot create database file %s\n", filename); return false; } @@ -233,9 +233,9 @@ bool CDB::VerifyEnvironment(const std::string &walletFile, const fs::path &dataDir, std::string &errorStr) { - LogPrint(BCLog::DB, "Using BerkeleyDB version %s\n", + LogPrint(BCLog::WALLETDB, "Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); - LogPrint(BCLog::DB, "Using wallet %s\n", walletFile); + LogPrint(BCLog::WALLETDB, "Using wallet %s\n", walletFile); // Wallet file must be a plain filename without a directory if (walletFile != fs::basename(walletFile) + fs::extension(walletFile)) { @@ -251,7 +251,7 @@ dataDir / strprintf("database.%d.bak", GetTime()); try { fs::rename(pathDatabase, pathDatabaseBak); - LogPrint(BCLog::DB, "Moved old %s to %s. Retrying.\n", + LogPrint(BCLog::WALLETDB, "Moved old %s to %s. Retrying.\n", pathDatabase.string(), pathDatabaseBak.string()); } catch (const fs::filesystem_error &) { // failure is ok (well, not really, but it's not worse than what we @@ -316,18 +316,18 @@ Db db(dbenv, 0); int result = db.verify(strFile.c_str(), nullptr, &strDump, flags); if (result == DB_VERIFY_BAD) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Salvage: Database salvage found errors, all data " "may not be recoverable.\n"); if (!fAggressive) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Salvage: Rerun with aggressive mode to ignore " "errors and continue.\n"); return false; } } if (result != 0 && result != DB_VERIFY_BAD) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Salvage: Database salvage failed with result %d.\n", result); return false; @@ -356,7 +356,7 @@ } getline(strDump, valueHex); if (valueHex == DATA_END) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Salvage: WARNING: Number of keys in data " "does not match number of values.\n"); break; @@ -366,7 +366,7 @@ } if (keyHex != DATA_END) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Salvage: WARNING: Unexpected end of file while " "reading salvage output.\n"); return false; @@ -522,7 +522,8 @@ env->mapFileUseCount.erase(strFile); bool fSuccess = true; - LogPrint(BCLog::DB, "CDB::Rewrite: Rewriting %s...\n", strFile); + LogPrint(BCLog::WALLETDB, "CDB::Rewrite: Rewriting %s...\n", + strFile); std::string strFileRes = strFile + ".rewrite"; { // surround usage of db with extra {} @@ -537,7 +538,7 @@ 0); if (ret > 0) { LogPrint( - BCLog::DB, + BCLog::WALLETDB, "CDB::Rewrite: Can't create database file %s\n", strFileRes); fSuccess = false; @@ -599,7 +600,7 @@ } if (!fSuccess) { LogPrint( - BCLog::DB, + BCLog::WALLETDB, "CDB::Rewrite: Failed to rewrite database file %s\n", strFileRes); } @@ -614,7 +615,7 @@ void CDBEnv::Flush(bool fShutdown) { int64_t nStart = GetTimeMillis(); // Flush log data to the actual data file on all files that are not in use - LogPrint(BCLog::DB, "CDBEnv::Flush: Flush(%s)%s\n", + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started"); if (!fDbEnvInit) { @@ -626,25 +627,28 @@ while (mi != mapFileUseCount.end()) { std::string strFile = (*mi).first; int nRefCount = (*mi).second; - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: Flushing %s (refcount = %d)...\n", strFile, nRefCount); if (nRefCount == 0) { // Move log data to the dat file CloseDb(strFile); - LogPrint(BCLog::DB, "CDBEnv::Flush: %s checkpoint\n", strFile); + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: %s checkpoint\n", + strFile); dbenv->txn_checkpoint(0, 0, 0); - LogPrint(BCLog::DB, "CDBEnv::Flush: %s detach\n", strFile); + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: %s detach\n", + strFile); if (!fMockDb) { dbenv->lsn_reset(strFile.c_str(), 0); } - LogPrint(BCLog::DB, "CDBEnv::Flush: %s closed\n", strFile); + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: %s closed\n", + strFile); mapFileUseCount.erase(mi++); } else { mi++; } } - LogPrint(BCLog::DB, "CDBEnv::Flush: Flush(%s)%s took %15dms\n", + LogPrint(BCLog::WALLETDB, "CDBEnv::Flush: Flush(%s)%s took %15dms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " database not started", GetTimeMillis() - nStart); @@ -683,7 +687,7 @@ std::map::iterator mi = env->mapFileUseCount.find(strFile); if (mi != env->mapFileUseCount.end()) { - LogPrint(BCLog::DB, "Flushing %s\n", strFile); + LogPrint(BCLog::WALLETDB, "Flushing %s\n", strFile); int64_t nStart = GetTimeMillis(); // Flush wallet file so it's self contained @@ -691,7 +695,7 @@ env->CheckpointLSN(strFile); env->mapFileUseCount.erase(mi++); - LogPrint(BCLog::DB, "Flushed %s %dms\n", strFile, + LogPrint(BCLog::WALLETDB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart); ret = true; } @@ -728,7 +732,7 @@ try { if (fs::equivalent(pathSrc, pathDest)) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "cannot backup to wallet source file %s\n", pathDest.string()); return false; @@ -736,11 +740,11 @@ fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists); - LogPrint(BCLog::DB, "copied %s to %s\n", strFile, + LogPrint(BCLog::WALLETDB, "copied %s to %s\n", strFile, pathDest.string()); return true; } catch (const fs::filesystem_error &e) { - LogPrint(BCLog::DB, "error copying %s to %s - %s\n", + LogPrint(BCLog::WALLETDB, "error copying %s to %s - %s\n", strFile, pathDest.string(), e.what()); return false; } diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -545,7 +545,7 @@ // Get cursor Dbc *pcursor = batch.GetCursor(); if (!pcursor) { - LogPrint(BCLog::DB, "Error getting wallet database cursor\n"); + LogPrint(BCLog::WALLETDB, "Error getting wallet database cursor\n"); return DB_CORRUPT; } @@ -559,7 +559,7 @@ } if (ret != 0) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "Error reading next record from wallet database\n"); return DB_CORRUPT; } @@ -583,7 +583,7 @@ } } if (!strErr.empty()) { - LogPrint(BCLog::DB, "%s\n", strErr); + LogPrint(BCLog::WALLETDB, "%s\n", strErr); } } pcursor->close(); @@ -603,9 +603,9 @@ return result; } - LogPrint(BCLog::DB, "nFileVersion = %d\n", wss.nFileVersion); + LogPrint(BCLog::WALLETDB, "nFileVersion = %d\n", wss.nFileVersion); - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "Keys: %u plaintext, %u encrypted, %u w/ metadata, %u total\n", wss.nKeys, wss.nCKeys, wss.nKeyMeta, wss.nKeys + wss.nCKeys); @@ -659,7 +659,7 @@ // Get cursor Dbc *pcursor = batch.GetCursor(); if (!pcursor) { - LogPrint(BCLog::DB, "Error getting wallet database cursor\n"); + LogPrint(BCLog::WALLETDB, "Error getting wallet database cursor\n"); return DB_CORRUPT; } @@ -673,7 +673,7 @@ } if (ret != 0) { - LogPrint(BCLog::DB, + LogPrint(BCLog::WALLETDB, "Error reading next record from wallet database\n"); return DB_CORRUPT; } @@ -731,8 +731,9 @@ if ((*it) == txid) { if (!EraseTx(txid)) { - LogPrint(BCLog::DB, "Transaction was found for deletion but " - "returned database error: %s\n", + LogPrint(BCLog::WALLETDB, + "Transaction was found for deletion but " + "returned database error: %s\n", txid.GetHex()); delerror = true; } @@ -829,8 +830,9 @@ return false; } if (!fReadOK) { - LogPrint(BCLog::DB, "WARNING: CWalletDB::Recover skipping %s: %s\n", - strType, strErr); + LogPrint(BCLog::WALLETDB, + "WARNING: CWalletDB::Recover skipping %s: %s\n", strType, + strErr); return false; }