Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: move the db lock to the data directory 

Locking just one db turns out to not have been a good idea, since
the pool and p2p state fdles have to be used anyway.

Also ensure the directory exists before tring to lock.
This commit is contained in:
moneromooo-monero 2016-02-04 18:09:45 +00:00
parent 5feebb4d87
commit 05bfb51d3e
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cryptonote_core/cryptonote_core.cpp
View File

@ -267,7 +267,16 @@ namespace cryptonote
boost::filesystem::path folder(m_config_folder); boost::filesystem::path folder(m_config_folder);
if (m_fakechain) if (m_fakechain)
folder /= "fake"; folder /= "fake";
//
// make sure the data directory exists, and try to lock it
CHECK_AND_ASSERT_MES (boost::filesystem::exists(folder) || boost::filesystem::create_directories(folder), false,
std::string("Failed to create directory ").append(folder.string()).c_str());
if (!lock_db_directory (folder))
{
LOG_ERROR ("Failed to lock " << folder);
return false;
}
// check for blockchain.bin // check for blockchain.bin
try try
{ {
@ -313,13 +322,6 @@ namespace cryptonote
folder /= db->get_db_name(); folder /= db->get_db_name();
LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ..."); LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ...");
if (!lock_db_directory (folder))
{
LOG_ERROR ("Failed to lock " << folder);
delete db;
return false;
}
const std::string filename = folder.string(); const std::string filename = folder.string();
// temporarily default to fastest:async:1000 // temporarily default to fastest:async:1000
blockchain_db_sync_mode sync_mode = db_async; blockchain_db_sync_mode sync_mode = db_async;