diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-05-21 20:37:58 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-05-21 20:37:58 +0200 |
commit | 252e8348002edc31e4fa59aba0aa03294fa19e0b (patch) | |
tree | f83f13447baba8a8436bba25b7936638fedf6bd6 /src/wallet/api/wallet.cpp | |
parent | Merge pull request #3815 (diff) | |
parent | Wallet API: allow log path to be non-default & console output to be configurable (diff) | |
download | monero-252e8348002edc31e4fa59aba0aa03294fa19e0b.tar.xz |
Merge pull request #3796
fac173d8 Wallet API: allow log path to be non-default & console output to be configurable (stoffu)
Diffstat (limited to 'src/wallet/api/wallet.cpp')
-rw-r--r-- | src/wallet/api/wallet.cpp | 4 |
1 files changed, 2 insertions, 2 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) { |