Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

re-enabled channels on android

Browse source
This commit is contained in:
cryptozoidberg 2020-02-21 17:53:12 +01:00
parent bb4e2be6d6
commit f621740c79
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/epee/include/misc_log_ex.h
View file

@ -113,14 +113,12 @@ DISABLE_VS_WARNINGS(4100)
#endif
#define LOG_DEFAULT_CHANNEL NULL
#ifndef ANDROID_BUILD
#define ENABLE_CHANNEL_BY_DEFAULT(ch_name) \
static bool COMBINE(init_channel, __LINE__) UNUSED_ATTRIBUTE = epee::misc_utils::static_initializer([](){ \
epee::log_space::log_singletone::enable_channel(ch_name); return true; \
});
#else
#define ENABLE_CHANNEL_BY_DEFAULT(ch_name)
#endif
#if defined(ENABLE_LOGGING_INTERNAL)
@ -1158,7 +1156,9 @@ namespace log_space
std::set<std::string> enabled_channels_local = genabled_channels;
enabled_channels_local.insert(ch_name);
genabled_channels.swap(enabled_channels_local);
#ifndef ANDROID_BUILD
std::cout << "log channel '" << ch_name << "' enabled" << std::endl;
#endif
}
static void disable_channels(const std::string& channels_set)

1
src/wallet/wallet2.h
View file

@ -46,7 +46,6 @@
#undef LOG_DEFAULT_CHANNEL
#define LOG_DEFAULT_CHANNEL "wallet"
ENABLE_CHANNEL_BY_DEFAULT("wallet");
// wallet-specific logging functions
#define WLT_LOG_L0(msg) LOG_PRINT_L0("[W:" << m_log_prefix << "] " << msg)