diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index 52c0fc3a..be9f3b61 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -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 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) diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 02f0e077..cdd64fd6 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -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)