History

Add node data to downstream avatar mixers

Ryan Huffman committed 9 years ago

Commit 52150ad1 parent 6c5947d3 files · +13 −5Browse files

Showing the changes to libraries/networking/src/ThreadedAssignment.cpp (1 of 3 files). Show all

Unified · Split

libraries/networking/src/ThreadedAssignment.cpp+4−3
@@ -134,7 +134,7 @@ void ThreadedAssignment::domainSettingsRequestFailed() { · 133 unmodified lines
134 setFinished(true);134 setFinished(true);
135}135}
136 136
137void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType) {137void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObject, NodeType_t nodeType, DownstreamNodeFoundCallback callback) {
138 static const QString REPLICATION_GROUP_KEY = "replication";138 static const QString REPLICATION_GROUP_KEY = "replication";
139 static const QString DOWNSTREAM_SERVERS_SETTING_KEY = "downstream_servers";139 static const QString DOWNSTREAM_SERVERS_SETTING_KEY = "downstream_servers";
140 if (settingsObject.contains(REPLICATION_GROUP_KEY)) {140 if (settingsObject.contains(REPLICATION_GROUP_KEY)) {
@@ -161,8 +161,9 @@ void ThreadedAssignment::parseDownstreamServers(const QJsonObject& settingsObjec · 20 unmodified lines
161 };161 };
162 162
163 // manually add the downstream node to our node list163 // manually add the downstream node to our node list
164 nodeList->addOrUpdateNode(QUuid::createUuid(), NodeType::downstreamType(nodeType),164 auto node = nodeList->addOrUpdateNode(QUuid::createUuid(), NodeType::downstreamType(nodeType),
165 downstreamServerAddr, downstreamServerAddr);165 downstreamServerAddr, downstreamServerAddr);
166 callback(*node);
166 }167 }
167 }168 }
168 }169 }