From e06c95f5863d3aeb67f1c18d624acc25743e605f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 15:51:49 -0800
Subject: [PATCH] make settings manager methods used for backup/restore thread
 safe

---
 .../src/DomainServerSettingsManager.cpp       | 24 +++++++++++++++++++
 .../src/DomainServerSettingsManager.h         |  6 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 8febbd5769..5e3c8e9cee 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -19,6 +19,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtCore/QStandardPaths>
+#include <QtCore/QThread>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
 
@@ -1196,6 +1197,16 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 }
 
 bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
+
+    if (thread() != QThread::currentThread()) {
+        bool success;
+        QMetaObject::invokeMethod(this, "restoreSettingsFromObject", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(bool, success),
+                                  Q_ARG(QJsonObject, settingsToRestore),
+                                  Q_ARG(SettingsType, settingsType));
+        return success;
+    }
+
     QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
         ? _domainSettingsDescription : _contentSettingsDescription;
 
@@ -1321,6 +1332,19 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                                                                        bool includeDefaults, bool isForBackup) {
     QJsonObject responseObject;
 
+    if (thread() != QThread::currentThread()) {
+        QMetaObject::invokeMethod(this, "settingsResponseObjectForType", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(QJsonObject, responseObject),
+                                  Q_ARG(const QString&, typeValue),
+                                  Q_ARG(bool, isAuthenticated),
+                                  Q_ARG(bool, includeDomainSettings),
+                                  Q_ARG(bool, includeContentSettings),
+                                  Q_ARG(bool, includeDefaults),
+                                  Q_ARG(bool, isForBackup));
+
+        return responseObject;
+    }
+
     if (!typeValue.isEmpty() || isAuthenticated) {
         // convert the string type value to a QJsonValue
         QJsonValue queryType = typeValue.isEmpty() ? QJsonValue() : QJsonValue(typeValue.toInt());
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 4316534685..abc70751a8 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -111,10 +111,12 @@ public:
 
     void debugDumpGroupsState();
 
-    QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+    /// thread safe method to retrieve a JSON representation of settings
+    Q_INVOKABLE QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
                                               bool includeDomainSettings = true, bool includeContentSettings = true,
                                               bool includeDefaults = true, bool isForBackup = false);
-    bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
+    /// thread safe method to restore settings from a JSON object
+    Q_INVOKABLE bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
 
 signals:
     void updateNodePermissions();