Allow to control logDir 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 79e925e919a0e9867f0857e2d42de4d07ef8d029..ea2c1bf604b7ca1f8152c34819ce5dfb01c620ea 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -408,7 +408,7 @@ void Application::setupLogging()
     // might be called from second instance
     auto logger = Logger::instance();
     logger->setLogFile(_logFile);
-    logger->setLogDir(_logDir);
+    logger->setLogDir(!_logDir.isEmpty() ? _logDir : ConfigFile().logDir());
     logger->setLogExpire(_logExpire > 0 ? _logExpire : ConfigFile().logExpire());
     logger->setLogFlush(_logFlush);
     logger->setLogDebug(_logDebug || ConfigFile().logDebug());

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 0c172e2e77891a6fdc24aee2a6dcee47276f2b7f..9a450b4b51fa9dd92d13ada11e01f724e767bc55 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 logDirC[] = "logDir";
 static const char logDebugC[] = "logDebug";
 static const char logExpireC[] = "logExpire";
 
@@ -855,6 +856,18 @@ void ConfigFile::setAutomaticLogDir(bool enabled)
     settings.setValue(QLatin1String(automaticLogDirC), enabled);
 }
 
+QString ConfigFile::logDir() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(logDirC), QString()).toString();
+}
+
+void ConfigFile::setLogDir(const QString &dir)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(logDirC), dir);
+}
+
 bool ConfigFile::logDebug() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 0d0b5cd3f2f351cf6ef894dd4f076dfc9ce5e49d..2919964ab437afa3d682854464e0155a9187c4eb 100644 (file)
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -92,6 +92,9 @@ public:
     bool automaticLogDir() const;
     void setAutomaticLogDir(bool enabled);
 
+    QString logDir() const;
+    void setLogDir(const QString &dir);
+
     bool logDebug() const;
     void setLogDebug(bool enabled);