aboutsummaryrefslogtreecommitdiff
path: root/tests/core_proxy
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-01-01 16:34:23 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-01-16 00:25:46 +0000
commit5833d66f6540e7b34e10ddef37c2b67bd501994b (patch)
treee4d312059948a0528583e7ea58d2c0b40307a494 /tests/core_proxy
parenteasylogging++: fix logging with static const header only data members (diff)
downloadmonero-5833d66f6540e7b34e10ddef37c2b67bd501994b.tar.xz
Change logging to easylogging++
This replaces the epee and data_loggers logging systems with a single one, and also adds filename:line and explicit severity levels. Categories may be defined, and logging severity set by category (or set of categories). epee style 0-4 log level maps to a sensible severity configuration. Log files now also rotate when reaching 100 MB. To select which logs to output, use the MONERO_LOGS environment variable, with a comma separated list of categories (globs are supported), with their requested severity level after a colon. If a log matches more than one such setting, the last one in the configuration string applies. A few examples: This one is (mostly) silent, only outputting fatal errors: MONERO_LOGS=*:FATAL This one is very verbose: MONERO_LOGS=*:TRACE This one is totally silent (logwise): MONERO_LOGS="" This one outputs all errors and warnings, except for the "verify" category, which prints just fatal errors (the verify category is used for logs about incoming transactions and blocks, and it is expected that some/many will fail to verify, hence we don't want the spam): MONERO_LOGS=*:WARNING,verify:FATAL Log levels are, in decreasing order of priority: FATAL, ERROR, WARNING, INFO, DEBUG, TRACE Subcategories may be added using prefixes and globs. This example will output net.p2p logs at the TRACE level, but all other net* logs only at INFO: MONERO_LOGS=*:ERROR,net*:INFO,net.p2p:TRACE Logs which are intended for the user (which Monero was using a lot through epee, but really isn't a nice way to go things) should use the "global" category. There are a few helper macros for using this category, eg: MGINFO("this shows up by default") or MGINFO_RED("this is red"), to try to keep a similar look and feel for now. Existing epee log macros still exist, and map to the new log levels, but since they're used as a "user facing" UI element as much as a logging system, they often don't map well to log severities (ie, a log level 0 log may be an error, or may be something we want the user to see, such as an important info). In those cases, I tried to use the new macros. In other cases, I left the existing macros in. When modifying logs, it is probably best to switch to the new macros with explicit levels. The --log-level options and set_log commands now also accept category settings, in addition to the epee style log levels.
Diffstat (limited to 'tests/core_proxy')
-rw-r--r--tests/core_proxy/CMakeLists.txt1
-rw-r--r--tests/core_proxy/core_proxy.cpp36
2 files changed, 17 insertions, 20 deletions
diff --git a/tests/core_proxy/CMakeLists.txt b/tests/core_proxy/CMakeLists.txt
index 3b86660c2..63438f21f 100644
--- a/tests/core_proxy/CMakeLists.txt
+++ b/tests/core_proxy/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(core_proxy
cryptonote_core
cryptonote_protocol
p2p
+ epee
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
set_property(TARGET core_proxy
diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp
index 6202eea0d..e7c69e9e5 100644
--- a/tests/core_proxy/core_proxy.cpp
+++ b/tests/core_proxy/core_proxy.cpp
@@ -75,11 +75,8 @@ int main(int argc, char* argv[])
string_tools::set_module_name_and_folder(argv[0]);
//set up logging options
- log_space::get_set_log_detalisation_level(true, LOG_LEVEL_2);
- //log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
- log_space::log_singletone::add_logger(LOGGER_FILE,
- log_space::log_singletone::get_default_log_file().c_str(),
- log_space::log_singletone::get_default_log_folder().c_str());
+ mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
+ mlog_set_log_level(2);
po::options_description desc("Allowed options");
@@ -97,8 +94,8 @@ int main(int argc, char* argv[])
if (!r)
return 1;
- LOG_PRINT("Module folder: " << argv[0], LOG_LEVEL_0);
- LOG_PRINT("Node starting ...", LOG_LEVEL_0);
+ MGINFO("Module folder: " << argv[0]);
+ MGINFO("Node starting ...");
//create objects and link them
@@ -113,32 +110,32 @@ int main(int argc, char* argv[])
//initialize objects
- LOG_PRINT_L0("Initializing p2p server...");
+ MGINFO("Initializing p2p server...");
bool res = p2psrv.init(vm);
CHECK_AND_ASSERT_MES(res, 1, "Failed to initialize p2p server.");
- LOG_PRINT_L0("P2p server initialized OK");
+ MGINFO("P2p server initialized OK");
- LOG_PRINT_L0("Initializing cryptonote protocol...");
+ MGINFO("Initializing cryptonote protocol...");
res = cprotocol.init(vm);
CHECK_AND_ASSERT_MES(res, 1, "Failed to initialize cryptonote protocol.");
- LOG_PRINT_L0("Cryptonote protocol initialized OK");
+ MGINFO("Cryptonote protocol initialized OK");
//initialize core here
- LOG_PRINT_L0("Initializing proxy core...");
+ MGINFO("Initializing proxy core...");
res = pr_core.init(vm);
CHECK_AND_ASSERT_MES(res, 1, "Failed to initialize core");
- LOG_PRINT_L0("Core initialized OK");
+ MGINFO("Core initialized OK");
- LOG_PRINT_L0("Starting p2p net loop...");
+ MGINFO("Starting p2p net loop...");
p2psrv.run();
- LOG_PRINT_L0("p2p net loop stopped");
+ MGINFO("p2p net loop stopped");
//deinitialize components
- LOG_PRINT_L0("Deinitializing core...");
+ MGINFO("Deinitializing core...");
pr_core.deinit();
- LOG_PRINT_L0("Deinitializing cryptonote_protocol...");
+ MGINFO("Deinitializing cryptonote_protocol...");
cprotocol.deinit();
- LOG_PRINT_L0("Deinitializing p2p...");
+ MGINFO("Deinitializing p2p...");
p2psrv.deinit();
@@ -146,8 +143,7 @@ int main(int argc, char* argv[])
cprotocol.set_p2p_endpoint(NULL);
- LOG_PRINT("Node stopped.", LOG_LEVEL_0);
- epee::net_utils::data_logger::get_instance().kill_instance();
+ MGINFO("Node stopped.");
return 0;
CATCH_ENTRY_L0("main", 1);