aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-02-21 11:28:58 +0200
committerRiccardo Spagni <ric@spagni.net>2017-02-21 11:28:58 +0200
commit50fadea8fa45f9f4baff72475b302c72c3cbb2b4 (patch)
treefb55439f30bca1e79ed9aa1ce00fa2eb5fd808d7 /src/wallet/api
parentMerge pull request #1728 (diff)
parentwallet_api: fix logging init via api (diff)
downloadmonero-50fadea8fa45f9f4baff72475b302c72c3cbb2b4.tar.xz
Merge pull request #1747
26bd7aac wallet_api: fix logging init via api (moneromooo-monero)
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/wallet.cpp5
-rw-r--r--src/wallet/api/wallet_manager.cpp1
2 files changed, 5 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();
}