lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

mainapplication: do not show log from daemon by default

Browse source 
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
This commit is contained in:
Sébastien Blin 2021-12-21 12:56:21 -05:00
parent 1a50d1105f
commit 784e08a169
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mainapplication.cpp
View file

@ -187,7 +187,7 @@ MainApplication::init()
initLrc(results[opts::UPDATEURL].toString(), initLrc(results[opts::UPDATEURL].toString(),
connectivityMonitor_.get(), connectivityMonitor_.get(),
results[opts::MUTEDAEMON].toBool()); results[opts::DEBUG].toBool() && !results[opts::MUTEDAEMON].toBool());
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
using namespace Interfaces; using namespace Interfaces;
@ -309,7 +309,7 @@ MainApplication::loadTranslations()
} }
void 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. * Init mainwindow and finish splash when mainwindow shows up.
@ -333,7 +333,7 @@ MainApplication::initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bo
}, },
downloadUrl, downloadUrl,
cm, cm,
muteDaemon)); !logDaemon));
lrcInstance_->subscribeToDebugReceived(); lrcInstance_->subscribeToDebugReceived();
} }
@ -377,7 +377,7 @@ MainApplication::parseArguments()
parser.addOption(updateUrlOption); parser.addOption(updateUrlOption);
#endif #endif
QCommandLineOption muteDaemonOption({"q", "quiet"}, "Mute daemon logging."); QCommandLineOption muteDaemonOption({"q", "quiet"}, "Mute daemon logging. (only if debug)");
parser.addOption(muteDaemonOption); parser.addOption(muteDaemonOption);
parser.process(*this); parser.process(*this);

2
src/mainapplication.h
View file

@ -70,7 +70,7 @@ private:
void fileDebug(QFile* debugFile); void fileDebug(QFile* debugFile);
void loadTranslations(); void loadTranslations();
void initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool muteDaemon); void initLrc(const QString& downloadUrl, ConnectivityMonitor* cm, bool logDaemon);
const QVariantMap parseArguments(); const QVariantMap parseArguments();
void setApplicationFont(); void setApplicationFont();
void initQmlLayer(); void initQmlLayer();