Merge pull request #1585

a480bf6b fixups in logging init calls, and add missing net context in a log (moneromooo-monero)

7 files changed, 7 insertions, 6 deletions

diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp
index 952855fa5..b4411fbba 100644
--- a/src/blockchain_utilities/blockchain_export.cpp
+++ b/src/blockchain_utilities/blockchain_export.cpp
@@ -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);
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp
index dc8d2d8fd..f21673b89 100644
--- a/src/blockchain_utilities/blockchain_import.cpp
+++ b/src/blockchain_utilities/blockchain_import.cpp
@@ -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;
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 16a75c422..58388f8f7 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -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
 
diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp
index e7c69e9e5..6edca1050 100644
--- a/tests/core_proxy/core_proxy.cpp
+++ b/tests/core_proxy/core_proxy.cpp
@@ -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);
 
 
diff --git a/tests/net_load_tests/clt.cpp b/tests/net_load_tests/clt.cpp
index ed0a297fd..39e8794b1 100644
--- a/tests/net_load_tests/clt.cpp
+++ b/tests/net_load_tests/clt.cpp
@@ -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();
diff --git a/tests/net_load_tests/srv.cpp b/tests/net_load_tests/srv.cpp
index ffa88d290..3bbbeef7f 100644
--- a/tests/net_load_tests/srv.cpp
+++ b/tests/net_load_tests/srv.cpp
@@ -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);
 
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp
index 856e81857..e552976a6 100644
--- a/tests/unit_tests/main.cpp
+++ b/tests/unit_tests/main.cpp
@@ -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);