Merge pull request #3345

e0cda74a wallet2_api: add info/error/warning entry points (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-03-14 13:35:53 +02:00
commit cfc5a3d4d4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 18 additions and 3 deletions

View File

@ -306,8 +306,20 @@ void Wallet::init(const char *argv0, const char *default_log_base_name) {
mlog_configure(mlog_get_default_log_path(default_log_base_name), true); mlog_configure(mlog_get_default_log_path(default_log_base_name), true);
} }
void Wallet::debug(const std::string &str) { void Wallet::debug(const std::string &category, const std::string &str) {
MDEBUG(str); MCDEBUG(category.empty() ? MONERO_DEFAULT_LOG_CATEGORY : category.c_str(), str);
}
void Wallet::info(const std::string &category, const std::string &str) {
MCINFO(category.empty() ? MONERO_DEFAULT_LOG_CATEGORY : category.c_str(), str);
}
void Wallet::warning(const std::string &category, const std::string &str) {
MCWARNING(category.empty() ? MONERO_DEFAULT_LOG_CATEGORY : category.c_str(), str);
}
void Wallet::error(const std::string &category, const std::string &str) {
MCERROR(category.empty() ? MONERO_DEFAULT_LOG_CATEGORY : category.c_str(), str);
} }
///////////////////////// WalletImpl implementation //////////////////////// ///////////////////////// WalletImpl implementation ////////////////////////

View File

@ -556,7 +556,10 @@ struct Wallet
static uint64_t maximumAllowedAmount(); static uint64_t maximumAllowedAmount();
// Easylogger wrapper // Easylogger wrapper
static void init(const char *argv0, const char *default_log_base_name); static void init(const char *argv0, const char *default_log_base_name);
static void debug(const std::string &str); static void debug(const std::string &category, const std::string &str);
static void info(const std::string &category, const std::string &str);
static void warning(const std::string &category, const std::string &str);
static void error(const std::string &category, const std::string &str);
/** /**
* @brief StartRefresh - Start/resume refresh thread (refresh every 10 seconds) * @brief StartRefresh - Start/resume refresh thread (refresh every 10 seconds)