diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:28:58 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:28:58 +0200 |
| commit | 50fadea8fa45f9f4baff72475b302c72c3cbb2b4 (patch) | |
| tree | fb55439f30bca1e79ed9aa1ce00fa2eb5fd808d7 | |
| parent | Merge pull request #1728 (diff) | |
| parent | wallet_api: fix logging init via api (diff) | |
| download | monero-50fadea8fa45f9f4baff72475b302c72c3cbb2b4.tar.xz | |
Merge pull request #1747
26bd7aac wallet_api: fix logging init via api (moneromooo-monero)
| -rw-r--r-- | src/wallet/api/wallet.cpp | 5 | ||||
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 326ca26a0..aeff2b943 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -258,6 +258,11 @@ uint64_t Wallet::maximumAllowedAmount() return std::numeric_limits<uint64_t>::max(); } +void Wallet::init(const char *argv0, const char *default_log_base_name) { + epee::string_tools::set_module_name_and_folder(argv0); + mlog_configure(mlog_get_default_log_path(default_log_base_name), true); +} + void Wallet::debug(const std::string &str) { MDEBUG(str); } diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 6feec75bd..253de19d2 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -451,7 +451,6 @@ WalletManager *WalletManagerFactory::getWalletManager() static WalletManagerImpl * g_walletManager = nullptr; if (!g_walletManager) { - mlog_configure("monero-wallet-gui.log", false); g_walletManager = new WalletManagerImpl(); } diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index daa3deeee..edead807f 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -429,6 +429,7 @@ struct Wallet static std::string paymentIdFromAddress(const std::string &str, bool testnet); static uint64_t maximumAllowedAmount(); // Easylogger wrapper + static void init(const char *argv0, const char *default_log_base_name); static void debug(const std::string &str); /** |