Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 23:29:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #461

Browse Source 
bc110af blockchain_utilities: properly exit on error (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-10-30 09:58:58 +02:00
commit 9ea58ebbae
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/blockchain_utilities/blockchain_dump.cpp
View File

@ -185,7 +185,7 @@ int main(int argc, char* argv[])
if (!boost::filesystem::is_directory(dir_path)) if (!boost::filesystem::is_directory(dir_path))
{ {
LOG_PRINT_RED_L0("dump directory path is a file: " << dir_path); LOG_PRINT_RED_L0("dump directory path is a file: " << dir_path);
return false; return 1;
} }
} }
else else
@ -193,7 +193,7 @@ int main(int argc, char* argv[])
if (!boost::filesystem::create_directory(dir_path)) if (!boost::filesystem::create_directory(dir_path))
{ {
LOG_PRINT_RED_L0("Failed to create directory " << dir_path); LOG_PRINT_RED_L0("Failed to create directory " << dir_path);
return false; return 1;
} }
} }
} }
@ -201,7 +201,7 @@ int main(int argc, char* argv[])
std::ofstream raw_data_file; std::ofstream raw_data_file;
raw_data_file.open(output_file_path.string(), std::ios_base::out | std::ios::trunc); raw_data_file.open(output_file_path.string(), std::ios_base::out | std::ios::trunc);
if (raw_data_file.fail()) if (raw_data_file.fail())
return false; return 1;
// If we wanted to use the memory pool, we would set up a fake_core. // If we wanted to use the memory pool, we would set up a fake_core.
@ -245,7 +245,7 @@ int main(int argc, char* argv[])
else else
{ {
LOG_PRINT_L0("Invalid db type: " << db_type); LOG_PRINT_L0("Invalid db type: " << db_type);
throw; return 1;
} }
boost::filesystem::path folder(m_config_folder); boost::filesystem::path folder(m_config_folder);
folder /= db->get_db_name(); folder /= db->get_db_name();
@ -259,7 +259,7 @@ int main(int argc, char* argv[])
catch (const std::exception& e) catch (const std::exception& e)
{ {
LOG_PRINT_L0("Error opening database: " << e.what()); LOG_PRINT_L0("Error opening database: " << e.what());
throw; return 1;
} }
r = core_storage->init(db, opt_testnet); r = core_storage->init(db, opt_testnet);
#endif #endif
@ -425,7 +425,7 @@ int main(int argc, char* argv[])
CHECK_AND_ASSERT_MES(r, false, "Failed to dump blockchain"); CHECK_AND_ASSERT_MES(r, false, "Failed to dump blockchain");
if (raw_data_file.fail()) if (raw_data_file.fail())
return false; return 1;
raw_data_file.flush(); raw_data_file.flush();
LOG_PRINT_L0("Blockchain dump OK"); LOG_PRINT_L0("Blockchain dump OK");

2
src/blockchain_utilities/blockchain_export.cpp
View File

@ -151,7 +151,7 @@ int main(int argc, char* argv[])
catch (const std::exception& e) catch (const std::exception& e)
{ {
LOG_PRINT_L0("Error opening database: " << e.what()); LOG_PRINT_L0("Error opening database: " << e.what());
throw; return 1;
} }
r = core_storage->init(db, opt_testnet); r = core_storage->init(db, opt_testnet);
#endif #endif