From 94abfc2d6b7e6ca58f352e0cab8f501ae55550e1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Jun 2017 11:47:13 -0700 Subject: [PATCH] nomenclature changes from replication to broadcast --- domain-server/resources/describe-settings.json | 14 +++++++------- domain-server/src/DomainServer.cpp | 6 +++--- domain-server/src/DomainServerSettingsManager.cpp | 7 ++++--- libraries/networking/src/ThreadedAssignment.cpp | 6 +++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 020262ca13..10da5b55fc 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -1320,15 +1320,15 @@ ] }, { - "name": "replication", - "label": "Replication", + "name": "broadcasting", + "label": "Broadcasting", "settings": [ { "name": "users", - "label": "Replicated Users", + "label": "Broadcasted Users", "type": "table", "can_add_new_rows": true, - "help": "Users that are replicated to downstream servers", + "help": "Users that are broadcasted to downstream servers", "numbered": false, "columns": [ { @@ -1340,11 +1340,11 @@ }, { "name": "downstream_servers", - "label": "Downstream Servers", + "label": "Receiving Servers", "assignment-types": [0,1], "type": "table", "can_add_new_rows": true, - "help": "Downstream servers that are relayed data for replicated users", + "help": "Servers that receive data for broadcasted users", "numbered": false, "columns": [ { @@ -1364,7 +1364,7 @@ "placeholder": "Audio Mixer", "default": "Audio Mixer", "can_set": true, - "options": [ + "options": [ { "value": "Audio Mixer", "label": "Audio Mixer" diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 0c0f8a5e55..81f10d83c6 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -2220,11 +2220,11 @@ void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer& } void DomainServer::updateReplicatedNodes() { - static const QString REPLICATION_SETTINGS_KEY = "replication"; + static const QString BROADCASTING_SETTINGS_KEY = "broadcasting"; _replicatedUsernames.clear(); auto settings = _settingsManager.getSettingsMap(); - if (settings.contains(REPLICATION_SETTINGS_KEY)) { - auto replicationSettings = settings.value(REPLICATION_SETTINGS_KEY).toMap(); + if (settings.contains(BROADCASTING_SETTINGS_KEY)) { + auto replicationSettings = settings.value(BROADCASTING_SETTINGS_KEY).toMap(); if (replicationSettings.contains("users")) { auto usersSettings = replicationSettings.value("users").toList(); for (auto& username : usersSettings) { diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 3d256bd2b9..9279648319 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -1197,7 +1197,7 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject) { static const QString SECURITY_ROOT_KEY = "security"; static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist"; - static const QString REPLICATION_KEY = "replication"; + static const QString BROADCASTING_KEY = "broadcasting"; auto& settingsVariant = _configMap.getConfig(); bool needRestart = false; @@ -1249,7 +1249,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ if (!matchingDescriptionObject.isEmpty()) { updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject); - if (rootKey != SECURITY_ROOT_KEY && rootKey != REPLICATION_KEY) { + if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY) { needRestart = true; } } else { @@ -1265,7 +1265,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ if (!matchingDescriptionObject.isEmpty()) { const QJsonValue& settingValue = rootValue.toObject()[settingKey]; updateSetting(settingKey, settingValue, *thisMap, matchingDescriptionObject); - if ((rootKey != SECURITY_ROOT_KEY && rootKey != REPLICATION_KEY) || settingKey == AC_SUBNET_WHITELIST_KEY) { + if ((rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY) + || settingKey == AC_SUBNET_WHITELIST_KEY) { needRestart = true; } } else { diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index 3e679f643a..430775a7ac 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -135,10 +135,10 @@ void ThreadedAssignment::domainSettingsRequestFailed() { } void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType, DownstreamNodeFoundCallback callback) { - static const QString REPLICATION_GROUP_KEY = "replication"; + static const QString BROADCASTING_GROUP_KEY = "broadcasting"; static const QString DOWNSTREAM_SERVERS_SETTING_KEY = "downstream_servers"; - if (settingsObject.contains(REPLICATION_GROUP_KEY)) { - const QJsonObject replicationObject = settingsObject[REPLICATION_GROUP_KEY].toObject(); + if (settingsObject.contains(BROADCASTING_GROUP_KEY)) { + const QJsonObject replicationObject = settingsObject[BROADCASTING_GROUP_KEY].toObject(); const QJsonArray downstreamServers = replicationObject[DOWNSTREAM_SERVERS_SETTING_KEY].toArray();