aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-18 20:44:23 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-18 20:44:23 +0000
commit26bd7aac033792a280d115a841757fb215c66fcc (patch)
tree8d9581b5ecdb00117b285c07675b4b7d02921538 /src
parentMerge pull request #1719 (diff)
downloadmonero-26bd7aac033792a280d115a841757fb215c66fcc.tar.xz
wallet_api: fix logging init via api
Diffstat (limited to 'src')
-rw-r--r--src/wallet/api/wallet.cpp5
-rw-r--r--src/wallet/api/wallet_manager.cpp1
-rw-r--r--src/wallet/wallet2_api.h1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index c46de6b06..25463aa3c 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 4104e7884..733b2e487 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);
/**