From 05bfb51d3ec548695af15fb6d4178e298c696425 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 4 Feb 2016 18:09:45 +0000 Subject: 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. --- src/cryptonote_core/cryptonote_core.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 8d50e8bfd..2479931be 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -267,7 +267,16 @@ namespace cryptonote boost::filesystem::path folder(m_config_folder); if (m_fakechain) 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 try { @@ -313,13 +322,6 @@ namespace cryptonote folder /= db->get_db_name(); 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(); // temporarily default to fastest:async:1000 blockchain_db_sync_mode sync_mode = db_async; -- cgit v1.2.3