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

Only use limited nodelist in DS

Browse source
This commit is contained in:
Atlante45 2015-01-14 14:24:54 -08:00
parent 48f1cbe644
commit 1399de52a5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1000,7 +1000,7 @@ void DomainServer::readAvailableDatagrams() {
void DomainServer::setupPendingAssignmentCredits() { void DomainServer::setupPendingAssignmentCredits() {
// enumerate the NodeList to find the assigned nodes // enumerate the NodeList to find the assigned nodes
DependencyManager::get<NodeList>()->eachNode([&](const SharedNodePointer& node){ DependencyManager::get<LimitedNodeList>()->eachNode([&](const SharedNodePointer& node){
DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(node->getLinkedData()); DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(node->getLinkedData());
if (!nodeData->getAssignmentUUID().isNull() && !nodeData->getWalletUUID().isNull()) { if (!nodeData->getAssignmentUUID().isNull() && !nodeData->getWalletUUID().isNull()) {
@ -1136,7 +1136,8 @@ void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr)
void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) { void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
const QString DOMAIN_UPDATE = "/api/v1/domains/%1"; const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
const QUuid& domainID = DependencyManager::get<LimitedNodeList>()->getSessionUUID(); auto nodeList = DependencyManager::get<LimitedNodeList>();
const QUuid& domainID = nodeList->getSessionUUID();
// setup the domain object to send to the data server // setup the domain object to send to the data server
const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address"; const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address";
@ -1160,7 +1161,7 @@ void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
// add the number of currently connected agent users // add the number of currently connected agent users
int numConnectedAuthedUsers = 0; int numConnectedAuthedUsers = 0;
DependencyManager::get<NodeList>()->eachNode([&numConnectedAuthedUsers](const SharedNodePointer& node){ nodeList->eachNode([&numConnectedAuthedUsers](const SharedNodePointer& node){
if (node->getLinkedData() && !static_cast<DomainServerNodeData*>(node->getLinkedData())->getUsername().isEmpty()) { if (node->getLinkedData() && !static_cast<DomainServerNodeData*>(node->getLinkedData())->getUsername().isEmpty()) {
++numConnectedAuthedUsers; ++numConnectedAuthedUsers;
} }
@ -1478,7 +1479,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
QJsonObject assignedNodesJSON; QJsonObject assignedNodesJSON;
// enumerate the NodeList to find the assigned nodes // enumerate the NodeList to find the assigned nodes
DependencyManager::get<NodeList>()->eachNode([this, &assignedNodesJSON](const SharedNodePointer& node){ nodeList->eachNode([this, &assignedNodesJSON](const SharedNodePointer& node){
DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(node->getLinkedData()); DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(node->getLinkedData());
if (!nodeData->getAssignmentUUID().isNull()) { if (!nodeData->getAssignmentUUID().isNull()) {
@ -2076,7 +2077,7 @@ void DomainServer::addStaticAssignmentsToQueue() {
// add any of the un-matched static assignments to the queue // add any of the un-matched static assignments to the queue
// enumerate the nodes and check if there is one with an attached assignment with matching UUID // enumerate the nodes and check if there is one with an attached assignment with matching UUID
if (!DependencyManager::get<NodeList>()->nodeWithUUID(staticAssignment->data()->getUUID())) { if (!DependencyManager::get<LimitedNodeList>()->nodeWithUUID(staticAssignment->data()->getUUID())) {
// this assignment has not been fulfilled - reset the UUID and add it to the assignment queue // this assignment has not been fulfilled - reset the UUID and add it to the assignment queue
refreshStaticAssignmentAndAddToQueue(*staticAssignment); refreshStaticAssignmentAndAddToQueue(*staticAssignment);
} }