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 ea2c1bf604b7ca1f8152c34819ce5dfb01c620ea..d6345b9fafca5cd818fdce4731c5edb6413a4778 100644 (file)
--- 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 9a450b4b51fa9dd92d13ada11e01f724e767bc55..39bd1d170d4476b4e68ce3bcefa5db235193ad8c 100644 (file)
--- 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 2919964ab437afa3d682854464e0155a9187c4eb..4133123750799bbda4081567ae2cefd1bd818ebd 100644 (file)
--- 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(),