Browse Source

Merge #8036: init: Move berkeleydb version reporting to wallet

3e2c946 init: Move berkeleydb version reporting to wallet (Wladimir J. van der Laan)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
41138f914d
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 5
      src/init.cpp
  2. 1
      src/wallet/wallet.cpp

5
src/init.cpp

@ -37,9 +37,7 @@ @@ -37,9 +37,7 @@
#include "utilmoneystr.h"
#include "validationinterface.h"
#ifdef ENABLE_WALLET
#include "wallet/db.h"
#include "wallet/wallet.h"
#include "wallet/walletdb.h"
#endif
#include <stdint.h>
#include <stdio.h>
@ -986,9 +984,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) @@ -986,9 +984,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (fPrintToDebugLog)
OpenDebugLog();
#ifdef ENABLE_WALLET
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
#endif
if (!fLogTimestamps)
LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());

1
src/wallet/wallet.cpp

@ -368,6 +368,7 @@ void CWallet::Flush(bool shutdown) @@ -368,6 +368,7 @@ void CWallet::Flush(bool shutdown)
bool CWallet::Verify()
{
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT);
LogPrintf("Using wallet %s\n", walletFile);

Loading…
Cancel
Save