Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1585

Browse Source 
a480bf6b fixups in logging init calls, and add missing net context in a log (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-01-16 08:41:33 -05:00
commit 71ac698b78
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockchain_utilities/blockchain_export.cpp
View File

@ -125,7 +125,7 @@ int main(int argc, char* argv[])
log_level = command_line::get_arg(vm, arg_log_level);
block_stop = command_line::get_arg(vm, arg_block_stop);
mlog_configure("", true);
mlog_configure("monero-blockchain-export", true);
LOG_PRINT_L0("Starting...");
bool opt_testnet = command_line::get_arg(vm, arg_testnet_on);

2
src/blockchain_utilities/blockchain_import.cpp
View File

@ -722,7 +722,7 @@ int main(int argc, char* argv[])
m_config_folder = command_line::get_arg(vm, data_dir_arg);
db_arg_str = command_line::get_arg(vm, arg_database);
mlog_configure("", true);
mlog_configure("monero-blockchain-import", true);
MINFO("Starting...");
boost::filesystem::path fs_import_file_path;

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -914,7 +914,7 @@ namespace cryptonote
if (m_core.get_current_blockchain_height() > previous_height)
{
MGINFO_YELLOW("Synced " << m_core.get_current_blockchain_height() << "/" << m_core.get_target_blockchain_height());
MGINFO_YELLOW(context << " Synced " << m_core.get_current_blockchain_height() << "/" << m_core.get_target_blockchain_height());
}
} // if not DISCARD BLOCK

2
tests/core_proxy/core_proxy.cpp
View File

@ -75,7 +75,7 @@ int main(int argc, char* argv[])
string_tools::set_module_name_and_folder(argv[0]);
//set up logging options
mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
mlog_configure(mlog_get_default_log_path("core_proxy.log"), true);
mlog_set_log_level(2);

2
tests/net_load_tests/clt.cpp
View File

@ -629,7 +629,7 @@ int main(int argc, char** argv)
{
epee::debug::get_set_enable_assert(true, false);
//set up logging options
mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
mlog_configure(mlog_get_default_log_path("net_load_tests_clt.log"), true);
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();

2
tests/net_load_tests/srv.cpp
View File

@ -216,7 +216,7 @@ namespace
int main(int argc, char** argv)
{
//set up logging options
mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
mlog_configure(mlog_get_default_log_path("net_load_tests_srv.log"), true);
size_t thread_count = (std::max)(min_thread_count, std::thread::hardware_concurrency() / 2);

1
tests/unit_tests/main.cpp
View File

@ -35,6 +35,7 @@
int main(int argc, char** argv)
{
epee::string_tools::set_module_name_and_folder(argv[0]);
mlog_configure(mlog_get_default_log_path("unit_tests.log"), true);
epee::debug::get_set_enable_assert(true, false);
::testing::InitGoogleTest(&argc, argv);