@ -43,7 +43,7 @@ void CDBEnv::EnvShutdown()
if ( ret ! = 0 )
if ( ret ! = 0 )
LogPrintf ( " CDBEnv::EnvShutdown: Error %d shutting down database environment: %s \n " , ret , DbEnv : : strerror ( ret ) ) ;
LogPrintf ( " CDBEnv::EnvShutdown: Error %d shutting down database environment: %s \n " , ret , DbEnv : : strerror ( ret ) ) ;
if ( ! fMockDb )
if ( ! fMockDb )
DbEnv ( 0 ) . remove ( path . string ( ) . c_str ( ) , 0 ) ;
DbEnv ( 0 ) . remove ( strPath . c_str ( ) , 0 ) ;
}
}
void CDBEnv : : Reset ( )
void CDBEnv : : Reset ( )
@ -78,10 +78,10 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn)
boost : : this_thread : : interruption_point ( ) ;
boost : : this_thread : : interruption_point ( ) ;
p ath = pathIn ;
strP ath = pathIn . string ( ) ;
boost : : filesystem : : path pathLogDir = path / " database " ;
boost : : filesystem : : path pathLogDir = pathIn / " database " ;
TryCreateDirectory ( pathLogDir ) ;
TryCreateDirectory ( pathLogDir ) ;
boost : : filesystem : : path pathErrorFile = path / " db.log " ;
boost : : filesystem : : path pathErrorFile = pathIn / " db.log " ;
LogPrintf ( " CDBEnv::Open: LogDir=%s ErrorFile=%s \n " , pathLogDir . string ( ) , pathErrorFile . string ( ) ) ;
LogPrintf ( " CDBEnv::Open: LogDir=%s ErrorFile=%s \n " , pathLogDir . string ( ) , pathErrorFile . string ( ) ) ;
unsigned int nEnvFlags = 0 ;
unsigned int nEnvFlags = 0 ;
@ -98,7 +98,7 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn)
dbenv - > set_flags ( DB_AUTO_COMMIT , 1 ) ;
dbenv - > set_flags ( DB_AUTO_COMMIT , 1 ) ;
dbenv - > set_flags ( DB_TXN_WRITE_NOSYNC , 1 ) ;
dbenv - > set_flags ( DB_TXN_WRITE_NOSYNC , 1 ) ;
dbenv - > log_set_config ( DB_LOG_AUTO_REMOVE , 1 ) ;
dbenv - > log_set_config ( DB_LOG_AUTO_REMOVE , 1 ) ;
int ret = dbenv - > open ( path . string ( ) . c_str ( ) ,
int ret = dbenv - > open ( strPath . c_str ( ) ,
DB_CREATE |
DB_CREATE |
DB_INIT_LOCK |
DB_INIT_LOCK |
DB_INIT_LOG |
DB_INIT_LOG |
@ -455,7 +455,7 @@ void CDBEnv::Flush(bool fShutdown)
dbenv - > log_archive ( & listp , DB_ARCH_REMOVE ) ;
dbenv - > log_archive ( & listp , DB_ARCH_REMOVE ) ;
Close ( ) ;
Close ( ) ;
if ( ! fMockDb )
if ( ! fMockDb )
boost : : filesystem : : remove_all ( path / " database " ) ;
boost : : filesystem : : remove_all ( boost : : filesystem : : path ( strPath ) / " database " ) ;
}
}
}
}
}
}