Merge pull request #1747

26bd7aac wallet_api: fix logging init via api (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:28:58 +02:00
commit 50fadea8fa
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 6 additions and 1 deletions

View file

@ -258,6 +258,11 @@ uint64_t Wallet::maximumAllowedAmount()
return std::numeric_limits<uint64_t>::max(); 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) { void Wallet::debug(const std::string &str) {
MDEBUG(str); MDEBUG(str);
} }

View file

@ -451,7 +451,6 @@ WalletManager *WalletManagerFactory::getWalletManager()
static WalletManagerImpl * g_walletManager = nullptr; static WalletManagerImpl * g_walletManager = nullptr;
if (!g_walletManager) { if (!g_walletManager) {
mlog_configure("monero-wallet-gui.log", false);
g_walletManager = new WalletManagerImpl(); g_walletManager = new WalletManagerImpl();
} }

View file

@ -429,6 +429,7 @@ struct Wallet
static std::string paymentIdFromAddress(const std::string &str, bool testnet); static std::string paymentIdFromAddress(const std::string &str, bool testnet);
static uint64_t maximumAllowedAmount(); static uint64_t maximumAllowedAmount();
// Easylogger wrapper // Easylogger wrapper
static void init(const char *argv0, const char *default_log_base_name);
static void debug(const std::string &str); static void debug(const std::string &str);
/** /**