From 784e08a169d2a1af494cdc4735639edcc209db23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Tue, 21 Dec 2021 12:56:21 -0500 Subject: [PATCH] mainapplication: do not show log from daemon by default logs from the daemon should not be shown by default, but only in debug mode, so makes --quiet usable, but only with --debug Change-Id: Ia7da32e31e034650d184dfae06c9157e13102906 --- src/mainapplication.cpp | 8 ++++---- src/mainapplication.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp index 076a824f..0c3209fc 100644 --- a/src/mainapplication.cpp +++ b/src/mainapplication.cpp @@ -187,7 +187,7 @@ MainApplication::init() initLrc(results[opts::UPDATEURL].toString(), connectivityMonitor_.get(), - results[opts::MUTEDAEMON].toBool()); + results[opts::DEBUG].toBool() && !results[opts::MUTEDAEMON].toBool()); #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) using namespace Interfaces; @@ -309,7 +309,7 @@ MainApplication::loadTranslations() } void -MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool muteDaemon) +MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon) { /* * Init mainwindow and finish splash when mainwindow shows up. @@ -333,7 +333,7 @@ MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bo }, downloadUrl, cm, - muteDaemon)); + !logDaemon)); lrcInstance_->subscribeToDebugReceived(); } @@ -377,7 +377,7 @@ MainApplication::parseArguments() parser.addOption(updateUrlOption); #endif - QCommandLineOption muteDaemonOption({"q", "quiet"}, "Mute daemon logging."); + QCommandLineOption muteDaemonOption({"q", "quiet"}, "Mute daemon logging. (only if debug)"); parser.addOption(muteDaemonOption); parser.process(*this); diff --git a/src/mainapplication.h b/src/mainapplication.h index be972170..51306be8 100644 --- a/src/mainapplication.h +++ b/src/mainapplication.h @@ -70,7 +70,7 @@ private: void fileDebug(QFile* debugFile); void loadTranslations(); - void initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool muteDaemon); + void initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon); const QVariantMap parseArguments(); void setApplicationFont(); void initQmlLayer();