aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-10-08 17:18:17 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-10-08 17:18:17 -0400
commitc2bb42168ba19bb8be4d330238080cb4233cd390 (patch)
treea41c410e8fe04edd5e01d714979b1ef09b44cd42 /src
parent43de64949c96b6d708b7d8a82c3dba0f6ddf059e (diff)
parente4954b12971a3f9c0d9bddfbabbfba36d4e9a747 (diff)
Merge branch 'BDB_DOWNGRADE'
Diffstat (limited to 'src')
-rw-r--r--src/db.cpp19
-rw-r--r--src/init.cpp15
2 files changed, 19 insertions, 15 deletions
diff --git a/src/db.cpp b/src/db.cpp
index 867703fbd2..7ca9e34953 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -34,19 +34,14 @@ void CDBEnv::EnvShutdown()
return;
fDbEnvInit = false;
- try
- {
- dbenv.close(0);
- }
- catch (const DbException& e)
- {
- printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno());
- }
+ int ret = dbenv.close(0);
+ if (ret != 0)
+ printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret);
if (!fMockDb)
DbEnv(0).remove(GetDataDir().string().c_str(), 0);
}
-CDBEnv::CDBEnv() : dbenv(0)
+CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS)
{
}
@@ -100,8 +95,8 @@ bool CDBEnv::Open(boost::filesystem::path pathEnv_)
DB_RECOVER |
nEnvFlags,
S_IRUSR | S_IWUSR);
- if (ret > 0)
- return error("CDB() : error %d opening database environment", ret);
+ if (ret != 0)
+ return error("CDB() : error %s (%d) opening database environment", DbEnv::strerror(ret), ret);
fDbEnvInit = true;
fMockDb = false;
@@ -191,7 +186,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) :
nFlags, // Flags
0);
- if (ret > 0)
+ if (ret != 0)
{
delete pdb;
pdb = NULL;
diff --git a/src/init.cpp b/src/init.cpp
index 0084dd6744..d271893644 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -439,8 +439,9 @@ bool AppInit2()
FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
if (file) fclose(file);
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
+ const char* pszDataDir = GetDataDir().string().c_str();
if (!lock.try_lock())
- return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), GetDataDir().string().c_str()));
+ return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), pszDataDir));
#if !defined(WIN32) && !defined(QT_GUI)
if (fDaemon)
@@ -472,7 +473,7 @@ bool AppInit2()
if (!fLogTimestamps)
printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
- printf("Used data directory %s\n", GetDataDir().string().c_str());
+ printf("Used data directory %s\n", pszDataDir);
std::ostringstream strErrors;
if (fDaemon)
@@ -588,6 +589,14 @@ bool AppInit2()
// ********************************************************* Step 6: load blockchain
+ if (!bitdb.Open(GetDataDir()))
+ {
+ string msg = strprintf(_("Error initializing database environment %s!"
+ " To recover, BACKUP THAT DIRECTORY, then remove"
+ " everything from it except for wallet.dat."), pszDataDir);
+ return InitError(msg);
+ }
+
if (GetBoolArg("-loadblockindextest"))
{
CTxDB txdb("r");
@@ -600,7 +609,7 @@ bool AppInit2()
printf("Loading block index...\n");
nStart = GetTimeMillis();
if (!LoadBlockIndex())
- strErrors << _("Error loading blkindex.dat") << "\n";
+ return InitError(_("Error loading blkindex.dat"));
// as LoadBlockIndex can take several minutes, it's possible the user
// requested to kill bitcoin-qt during the last operation. If so, exit.