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

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 20d5b6e9b..916cf1e66 100644
--- 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 9cd3b994a..ea351388a 100644
--- 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 7b84ef89c..487c35f8b 100644
--- 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(),