Allow to control log debug 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 20d5b6e9bb8fcc25cfee195d9fd696b0f4944e8a..916cf1e665e86ce724bccaf465859233bdfdf28a 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -411,7 +411,7 @@ void Application::setupLogging()
     logger->setLogDir(_logDir);
     logger->setLogExpire(_logExpire);
     logger->setLogFlush(_logFlush);
-    logger->setLogDebug(_logDebug);
+    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 9cd3b994a767e65e9f91dfea028b2ff6ac034333..ea351388a757973c6fcd8da7aa7b0f1d6e0fc63c 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -73,6 +73,7 @@ static const char minChunkSizeC[] = "minChunkSize";
 static const char maxChunkSizeC[] = "maxChunkSize";
 static const char targetChunkUploadDurationC[] = "targetChunkUploadDuration";
 static const char automaticLogDirC[] = "logToTemporaryLogDir";
+static const char logDebugC[] = "logDebug";
 
 static const char proxyHostC[] = "Proxy/host";
 static const char proxyTypeC[] = "Proxy/type";
@@ -853,6 +854,18 @@ void ConfigFile::setAutomaticLogDir(bool enabled)
     settings.setValue(QLatin1String(automaticLogDirC), enabled);
 }
 
+bool ConfigFile::logDebug() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(logDebugC), false).toBool();
+}
+
+void ConfigFile::setLogDebug(bool enabled)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(logDebugC), enabled);
+}
+
 QString ConfigFile::certificatePath() const
 {
     return retrieveData(QString(), QLatin1String(certPath)).toString();

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 7b84ef89c3d6274635549906939cfee03e9f6f76..487c35f8b4a87eb8152a316f95c4f7c076d76fc1 100644 (file)
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -92,6 +92,9 @@ public:
     bool automaticLogDir() const;
     void setAutomaticLogDir(bool enabled);
 
+    bool logDebug() const;
+    void setLogDebug(bool enabled);
+
     // proxy settings
     void setProxyType(int proxyType,
         const QString &host = QString(),