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.

7 files changed, 52 insertions, 60 deletions

diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index 48faa3183..12bce0285 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -436,7 +436,7 @@ WalletManager *WalletManagerFactory::getWalletManager()
     static WalletManagerImpl * g_walletManager = nullptr;
 
     if  (!g_walletManager) {
-        epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_MAX);
+        mlog_configure("monero-wallet-gui.log", false);
         g_walletManager = new WalletManagerImpl();
     }
 
@@ -445,7 +445,7 @@ WalletManager *WalletManagerFactory::getWalletManager()
 
 void WalletManagerFactory::setLogLevel(int level)
 {
-    epee::log_space::log_singletone::get_set_log_detalisation_level(true, level);
+    mlog_set_log_level(level);
 }
 
 
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 8a03b94af..25b21c722 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -67,6 +67,9 @@ extern "C"
 }
 using namespace cryptonote;
 
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.wallet2"
+
 // used to choose when to stop adding outputs to a tx
 #define APPROXIMATE_INPUT_BYTES 80
 
@@ -2065,7 +2068,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
   THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file);
 
   r = file_io_utils::save_string_to_file(m_wallet_file + ".address.txt", m_account.get_public_address_str(m_testnet));
-  if(!r) LOG_PRINT_RED_L0("String with address text not saved");
+  if(!r) MERROR("String with address text not saved");
 
   cryptonote::block b;
   generate_genesis(b);
@@ -2100,7 +2103,7 @@ void wallet2::generate(const std::string& wallet_, const std::string& password,
   THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file);
 
   r = file_io_utils::save_string_to_file(m_wallet_file + ".address.txt", m_account.get_public_address_str(m_testnet));
-  if(!r) LOG_PRINT_RED_L0("String with address text not saved");
+  if(!r) MERROR("String with address text not saved");
 
   cryptonote::block b;
   generate_genesis(b);
@@ -2135,7 +2138,7 @@ void wallet2::generate(const std::string& wallet_, const std::string& password,
   THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file);
 
   r = file_io_utils::save_string_to_file(m_wallet_file + ".address.txt", m_account.get_public_address_str(m_testnet));
-  if(!r) LOG_PRINT_RED_L0("String with address text not saved");
+  if(!r) MERROR("String with address text not saved");
 
   cryptonote::block b;
   generate_genesis(b);
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 5a569950f..b5542440b 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -56,6 +56,10 @@
 #include "password_container.h"
 
 #include <iostream>
+
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.wallet2"
+
 #define WALLET_RCP_CONNECTION_TIMEOUT                          200000
 
 class Serialization_portability_wallet_Test;
diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp
index f7eec8cfc..7ec4ad6e4 100644
--- a/src/wallet/wallet_args.cpp
+++ b/src/wallet/wallet_args.cpp
@@ -40,6 +40,9 @@
 #include <crtdbg.h>
 #endif
 
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.wallet2"
+
 // workaround for a suspected bug in pthread/kernel on MacOS X
 #ifdef __APPLE__
 #define DEFAULT_MAX_CONCURRENCY 1
@@ -78,7 +81,7 @@ namespace wallet_args
     _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
 #endif
 
-    const command_line::arg_descriptor<uint32_t> arg_log_level = {"log-level", "", LOG_LEVEL_0};
+    const command_line::arg_descriptor<std::string> arg_log_level = {"log-level", "0-4 or categories", ""};
     const command_line::arg_descriptor<uint32_t> arg_max_concurrency = {"max-concurrency", wallet_args::tr("Max number of threads to use for a parallel job"), DEFAULT_MAX_CONCURRENCY};
     const command_line::arg_descriptor<std::string> arg_log_file = {"log-file", wallet_args::tr("Specify log file"), ""};
 
@@ -93,26 +96,7 @@ namespace wallet_args
     command_line::add_arg(desc_general, command_line::arg_help);
     command_line::add_arg(desc_general, command_line::arg_version);
 
-
-    bf::path default_log {epee::log_space::log_singletone::get_default_log_folder()};
-    std::string log_file_name = epee::log_space::log_singletone::get_default_log_file();
-    if (log_file_name.empty())
-    {
-      // Sanity check: File path should also be empty if file name is. If not,
-      // this would be a problem in epee's discovery of current process's file
-      // path.
-      if (! default_log.empty())
-      {
-        tools::fail_msg_writer() << wallet_args::tr("unexpected empty log file name in presence of non-empty file path");
-        return boost::none;
-      }
-      // epee didn't find path to executable from argv[0], so use this default file name.
-      log_file_name = "monero-wallet-cli.log";
-      // The full path will use cwd because epee also returned an empty default log folder.
-    }
-    default_log /= log_file_name;
-
-    command_line::add_arg(desc_params, arg_log_file, default_log.string());
+    command_line::add_arg(desc_params, arg_log_file, "");
     command_line::add_arg(desc_params, arg_log_level);
     command_line::add_arg(desc_params, arg_max_concurrency);
 
@@ -146,39 +130,28 @@ namespace wallet_args
     if (!r)
       return boost::none;
 
-    // log_file_path
-    //   default: < argv[0] directory >/monero-wallet-cli.log
-    //     so if ran as "monero-wallet-cli" (no path), log file will be in cwd
-    //
-    //   if log-file argument given:
-    //     absolute path
-    //     relative path: relative to cwd
-
-    // Set log file
-    bf::path log_file_path {bf::absolute(command_line::get_arg(vm, arg_log_file))};
-
-    // Set up logging options
-    int log_level = LOG_LEVEL_2;
-    epee::log_space::get_set_log_detalisation_level(true, log_level);
-    //epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_0);
-    epee::log_space::log_singletone::add_logger(LOGGER_FILE,
-      log_file_path.filename().string().c_str(),
-      log_file_path.parent_path().string().c_str(),
-      LOG_LEVEL_4
-    );
-
     if(command_line::has_arg(vm, arg_max_concurrency))
       tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency));
 
-    tools::scoped_message_writer(epee::log_space::console_color_white, true) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
+    std::string log_path;
+    if (!vm["log-file"].defaulted())
+      log_path = command_line::get_arg(vm, arg_log_file);
+    else
+      log_path = mlog_get_default_log_path("monero-wallet-cli,log");
+    mlog_configure(log_path, false);
+    if (!vm["log-level"].defaulted())
+    {
+      mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
+    }
+
+    tools::scoped_message_writer(epee::console_color_white, true) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
 
-    if(command_line::has_arg(vm, arg_log_level))
-      log_level = command_line::get_arg(vm, arg_log_level);
-    LOG_PRINT_L0("Setting log level = " << log_level);
-    LOG_PRINT_L0(wallet_args::tr("default_log: ") << default_log.string());
-    tools::scoped_message_writer(epee::log_space::console_color_white, true) << boost::format(wallet_args::tr("Logging at log level %d to %s")) %
-      log_level % log_file_path.string();
-    epee::log_space::get_set_log_detalisation_level(true, log_level);
+    if (!vm["log-level"].defaulted())
+      MINFO("Setting log level = " << command_line::get_arg(vm, arg_log_level));
+    else
+      MINFO("Setting log levels = " << getenv("MONERO_LOGS"));
+    MINFO(wallet_args::tr("Logging to: ") << log_path);
+    tools::scoped_message_writer(epee::console_color_white, true) << boost::format(wallet_args::tr("Logging to %s")) % log_path;
 
     return {std::move(vm)};
   }
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index d61b11f8a..bf2cba346 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -46,6 +46,9 @@ using namespace epee;
 #include "string_tools.h"
 #include "crypto/hash.h"
 
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.rpc"
+
 namespace
 {
   const command_line::arg_descriptor<std::string, true> arg_rpc_bind_port = {"rpc-bind-port", "Sets bind port for server"};
@@ -1323,7 +1326,8 @@ int main(int argc, char** argv) {
     return 1;
   }
 
-  epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_2);
+  mlog_configure("monero-wallet-rpc.log", true);
+  mlog_set_log_level(2);
 
   std::unique_ptr<tools::wallet2> wal;
   try
@@ -1368,12 +1372,12 @@ int main(int argc, char** argv) {
     // if we ^C during potentially length load/refresh, there's no server loop yet
     if (quit)
     {
-      LOG_PRINT_L0(tools::wallet_rpc_server::tr("Storing wallet..."));
+      MINFO(tools::wallet_rpc_server::tr("Storing wallet..."));
       wal->store();
-      LOG_PRINT_GREEN(tools::wallet_rpc_server::tr("Stored ok"), LOG_LEVEL_0);
+      MINFO(tools::wallet_rpc_server::tr("Stored ok"));
       return 1;
     }
-    LOG_PRINT_GREEN(tools::wallet_rpc_server::tr("Loaded ok"), LOG_LEVEL_0);
+    MINFO(tools::wallet_rpc_server::tr("Loaded ok"));
   }
   catch (const std::exception& e)
   {
@@ -1393,7 +1397,7 @@ int main(int argc, char** argv) {
   {
     LOG_PRINT_L0(tools::wallet_rpc_server::tr("Storing wallet..."));
     wal->store();
-    LOG_PRINT_GREEN(tools::wallet_rpc_server::tr("Stored ok"), LOG_LEVEL_0);
+    LOG_PRINT_L0(tools::wallet_rpc_server::tr("Stored ok"));
   }
   catch (const std::exception& e)
   {
diff --git a/src/wallet/wallet_rpc_server.h b/src/wallet/wallet_rpc_server.h
index 4ff1b267f..7d5db1bcb 100644
--- a/src/wallet/wallet_rpc_server.h
+++ b/src/wallet/wallet_rpc_server.h
@@ -36,6 +36,10 @@
 #include "net/http_server_impl_base.h"
 #include "wallet_rpc_server_commands_defs.h"
 #include "wallet2.h"
+
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.rpc"
+
 namespace tools
 {
   /************************************************************************/
diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index ea0fc685f..4d643637f 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -33,6 +33,10 @@
 #include "cryptonote_core/cryptonote_basic.h"
 #include "crypto/hash.h"
 #include "wallet_rpc_server_error_codes.h"
+
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "wallet.rpc"
+
 namespace tools
 {
 namespace wallet_rpc