From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 1 Jul 2020 14:10:10 +0000 (+0200)
Subject: Allow to control logFlush from the config file
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~126^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fdceb1f2d2f86c0f56082dc763f5215107385eb1;p=nextcloud-desktop.git

Allow to control logFlush from the config file

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index ea2c1bf60..d6345b9fa 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -410,7 +410,7 @@ void Application::setupLogging()
     logger->setLogFile(_logFile);
     logger->setLogDir(!_logDir.isEmpty() ? _logDir : ConfigFile().logDir());
     logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire());
-    logger->setLogFlush(_logFlush);
+    logger->setLogFlush(_logFlush || ConfigFile().logFlush());
     logger->setLogDebug(_logDebug || ConfigFile().logDebug());
     if (!logger->isLoggingToFile() && ConfigFile().automaticLogDir()) {
         logger->setupTemporaryFolderLogDir();
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 9a450b4b5..39bd1d170 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -76,6 +76,7 @@ static const char automaticLogDirC[] = "logToTemporaryLogDir";
 static const char logDirC[] = "logDir";
 static const char logDebugC[] = "logDebug";
 static const char logExpireC[] = "logExpire";
+static const char logFlushC[] = "logFlush";
 
 static const char proxyHostC[] = "Proxy/host";
 static const char proxyTypeC[] = "Proxy/type";
@@ -892,6 +893,18 @@ void ConfigFile::setLogExpire(int hours)
     settings.setValue(QLatin1String(logExpireC), hours);
 }
 
+bool ConfigFile::logFlush() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(logFlushC), false).toBool();
+}
+
+void ConfigFile::setLogFlush(bool enabled)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(logFlushC), enabled);
+}
+
 QString ConfigFile::certificatePath() const
 {
     return retrieveData(QString(), QLatin1String(certPath)).toString();
diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 2919964ab..413312375 100644
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -101,6 +101,9 @@ public:
     int logExpire() const;
     void setLogExpire(int hours);
 
+    bool logFlush() const;
+    void setLogFlush(bool enabled);
+
     // proxy settings
     void setProxyType(int proxyType,
         const QString &host = QString(),