From: gg Date: Wed, 14 Jan 2026 15:07:43 +0000 (-0500) Subject: fix logging suppression issues X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=93f6a69e5a6d70ba698d4d09892b88f1e13eff8b;p=gamesguru%2Ffeather.git fix logging suppression issues --- diff --git a/src/main.cpp b/src/main.cpp index 3e0afd32..4b57478e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -171,9 +171,11 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { } // Setup logging - QString logPath = QString("%1/libwallet.log").arg(configDir); + QString logPath = conf()->get(Config::disableLogging).toBool() ? "" : QString("%1/libwallet.log").arg(configDir); + bool consoleLogging = !conf()->get(Config::disableLoggingStdout).toBool(); + Monero::Utils::onStartup(); - Monero::Wallet::init("", "feather", logPath.toStdString(), true); + Monero::Wallet::init("", "feather", logPath.toStdString(), consoleLogging); bool logLevelFromEnv; int logLevel = qEnvironmentVariableIntValue("MONERO_LOG_LEVEL", &logLevelFromEnv); @@ -183,11 +185,12 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { logLevel = conf()->get(Config::logLevel).toInt(); } - if (parser.isSet("quiet") || conf()->get(Config::disableLogging).toBool()) { - if (conf()->get(Config::disableLogging).toBool()) { - qWarning() << "Logging is disabled via configuration"; - } else { + bool disableEverything = parser.isSet("quiet") || (conf()->get(Config::disableLogging).toBool() && conf()->get(Config::disableLoggingStdout).toBool()); + if (disableEverything) { + if (parser.isSet("quiet")) { qWarning() << "Logging is disabled via --quiet flag"; + } else { + qWarning() << "Logging is disabled via configuration"; } WalletManager::instance()->setLogLevel(-1); } diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index d037390f..d9e42776 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -559,7 +559,7 @@ QTextCharFormat addressTextFormat(const SubaddressIndex &index, quint64 amount) } void applicationLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { - if (conf()->get(Config::disableLoggingStdout).toBool() || conf()->get(Config::disableLogging).toBool()) + if (conf()->get(Config::disableLoggingStdout).toBool()) return; int level = conf()->get(Config::logLevel).toInt();