Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist

Browse source
This commit is contained in:
Stephen Birarda 2017-06-15 14:30:08 -07:00
commit ea6a38148c
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
domain-server/resources/describe-settings.json
View file

@ -1320,15 +1320,15 @@
] ]
}, },
{ {
"name": "replication", "name": "broadcasting",
"label": "Replication", "label": "Broadcasting",
"settings": [ "settings": [
{ {
"name": "users", "name": "users",
"label": "Replicated Users", "label": "Broadcasted Users",
"type": "table", "type": "table",
"can_add_new_rows": true, "can_add_new_rows": true,
"help": "Users that are replicated to downstream servers", "help": "Users that are broadcasted to downstream servers",
"numbered": false, "numbered": false,
"columns": [ "columns": [
{ {
@ -1340,11 +1340,11 @@
}, },
{ {
"name": "downstream_servers", "name": "downstream_servers",
"label": "Downstream Servers", "label": "Receiving Servers",
"assignment-types": [0,1], "assignment-types": [0,1],
"type": "table", "type": "table",
"can_add_new_rows": true, "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, "numbered": false,
"columns": [ "columns": [
{ {
@ -1364,7 +1364,7 @@
"placeholder": "Audio Mixer", "placeholder": "Audio Mixer",
"default": "Audio Mixer", "default": "Audio Mixer",
"can_set": true, "can_set": true,
"options": [ "options": [
{ {
"value": "Audio Mixer", "value": "Audio Mixer",
"label": "Audio Mixer" "label": "Audio Mixer"

10
domain-server/src/DomainServer.cpp
View file

@ -2222,14 +2222,14 @@ void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer&
_unfulfilledAssignments.enqueue(assignment); _unfulfilledAssignments.enqueue(assignment);
} }
static const QString REPLICATION_SETTINGS_KEY = "replication"; static const QString BROADCASTING_SETTINGS_KEY = "broadcasting";
void DomainServer::updateDownstreamNodes() { void DomainServer::updateDownstreamNodes() {
auto settings = _settingsManager.getSettingsMap(); auto settings = _settingsManager.getSettingsMap();
if (settings.contains(REPLICATION_SETTINGS_KEY)) { if (settings.contains(BROADCASTING_SETTINGS_KEY)) {
auto nodeList = DependencyManager::get<LimitedNodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();
std::vector<HifiSockAddr> downstreamNodesInSettings; std::vector<HifiSockAddr> downstreamNodesInSettings;
auto replicationSettings = settings.value(REPLICATION_SETTINGS_KEY).toMap(); auto replicationSettings = settings.value(BROADCASTING_SETTINGS_KEY).toMap();
if (replicationSettings.contains("downstream_servers")) { if (replicationSettings.contains("downstream_servers")) {
auto serversSettings = replicationSettings.value("downstream_servers").toList(); auto serversSettings = replicationSettings.value("downstream_servers").toList();
@ -2302,8 +2302,8 @@ void DomainServer::updateReplicatedNodes() {
static const QString REPLICATED_USERS_KEY = "users"; static const QString REPLICATED_USERS_KEY = "users";
_replicatedUsernames.clear(); _replicatedUsernames.clear();
if (settings.contains(REPLICATION_SETTINGS_KEY)) { if (settings.contains(BROADCASTING_SETTINGS_KEY)) {
auto replicationSettings = settings.value(REPLICATION_SETTINGS_KEY).toMap(); auto replicationSettings = settings.value(BROADCASTING_SETTINGS_KEY).toMap();
if (replicationSettings.contains(REPLICATED_USERS_KEY)) { if (replicationSettings.contains(REPLICATED_USERS_KEY)) {
auto usersSettings = replicationSettings.value(REPLICATED_USERS_KEY).toList(); auto usersSettings = replicationSettings.value(REPLICATED_USERS_KEY).toList();
for (auto& username : usersSettings) { for (auto& username : usersSettings) {

7
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -1197,7 +1197,7 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson
bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject) { bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject) {
static const QString SECURITY_ROOT_KEY = "security"; static const QString SECURITY_ROOT_KEY = "security";
static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist"; 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(); auto& settingsVariant = _configMap.getConfig();
bool needRestart = false; bool needRestart = false;
@ -1249,7 +1249,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
if (!matchingDescriptionObject.isEmpty()) { if (!matchingDescriptionObject.isEmpty()) {
updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject); updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject);
if (rootKey != SECURITY_ROOT_KEY && rootKey != REPLICATION_KEY) { if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY) {
needRestart = true; needRestart = true;
} }
} else { } else {
@ -1265,7 +1265,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
if (!matchingDescriptionObject.isEmpty()) { if (!matchingDescriptionObject.isEmpty()) {
const QJsonValue& settingValue = rootValue.toObject()[settingKey]; const QJsonValue& settingValue = rootValue.toObject()[settingKey];
updateSetting(settingKey, settingValue, *thisMap, matchingDescriptionObject); 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; needRestart = true;
} }
} else { } else {