Allow to control logExpire 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 916cf1e665e86ce724bccaf465859233bdfdf28a..79e925e919a0e9867f0857e2d42de4d07ef8d029 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -409,7 +409,7 @@ void Application::setupLogging()
     auto logger = Logger::instance();
     logger->setLogFile(_logFile);
     logger->setLogDir(_logDir);
-    logger->setLogExpire(_logExpire);
+    logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire());
     logger->setLogFlush(_logFlush);
     logger->setLogDebug(_logDebug || ConfigFile().logDebug());
     if (!logger->isLoggingToFile() && ConfigFile().automaticLogDir()) {

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index ea351388a757973c6fcd8da7aa7b0f1d6e0fc63c..0c172e2e77891a6fdc24aee2a6dcee47276f2b7f 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -74,6 +74,7 @@ static const char maxChunkSizeC[] = "maxChunkSize";
 static const char targetChunkUploadDurationC[] = "targetChunkUploadDuration";
 static const char automaticLogDirC[] = "logToTemporaryLogDir";
 static const char logDebugC[] = "logDebug";
+static const char logExpireC[] = "logExpire";
 
 static const char proxyHostC[] = "Proxy/host";
 static const char proxyTypeC[] = "Proxy/type";
@@ -866,6 +867,18 @@ void ConfigFile::setLogDebug(bool enabled)
     settings.setValue(QLatin1String(logDebugC), enabled);
 }
 
+int ConfigFile::logExpire() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(logExpireC), 0).toBool();
+}
+
+void ConfigFile::setLogExpire(int hours)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(logExpireC), hours);
+}
+
 QString ConfigFile::certificatePath() const
 {
     return retrieveData(QString(), QLatin1String(certPath)).toString();

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 487c35f8b4a87eb8152a316f95c4f7c076d76fc1..0d0b5cd3f2f351cf6ef894dd4f076dfc9ce5e49d 100644 (file)
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -95,6 +95,9 @@ public:
     bool logDebug() const;
     void setLogDebug(bool enabled);
 
+    int logExpire() const;
+    void setLogExpire(int hours);
+
     // proxy settings
     void setProxyType(int proxyType,
         const QString &host = QString(),