diff options
| author | stoffu <stoffu@protonmail.ch> | 2018-05-02 11:46:46 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2018-05-04 10:21:25 +0900 |
| commit | b13bddc3c9eac8775f89d220fed9351592e6194a (patch) | |
| tree | 14074fbb1121626c31dcb36c9909459dbada6c95 /src | |
| parent | Merge pull request #3719 (diff) | |
| download | monero-b13bddc3c9eac8775f89d220fed9351592e6194a.tar.xz | |
Wallet API: allow log path to be non-default & console output to be configurable
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/api/wallet2_api.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index b78a471b9..367011eaa 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -305,14 +305,14 @@ uint64_t Wallet::maximumAllowedAmount() return std::numeric_limits<uint64_t>::max(); } -void Wallet::init(const char *argv0, const char *default_log_base_name) { +void Wallet::init(const char *argv0, const char *default_log_base_name, const std::string &log_path, bool console) { #ifdef WIN32 // Activate UTF-8 support for Boost filesystem classes on Windows std::locale::global(boost::locale::generator().generate("")); boost::filesystem::path::imbue(std::locale()); #endif epee::string_tools::set_module_name_and_folder(argv0); - mlog_configure(mlog_get_default_log_path(default_log_base_name), true); + mlog_configure(log_path.empty() ? mlog_get_default_log_path(default_log_base_name) : log_path.c_str(), console); } void Wallet::debug(const std::string &category, const std::string &str) { diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h index 617b6035a..4fbc7298a 100644 --- a/src/wallet/api/wallet2_api.h +++ b/src/wallet/api/wallet2_api.h @@ -556,7 +556,8 @@ struct Wallet } static uint64_t maximumAllowedAmount(); // 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) { init(argv0, default_log_base_name, "", true); } + static void init(const char *argv0, const char *default_log_base_name, const std::string &log_path, bool console); 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); |