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

remove the DomainServer singleton instance from DS

Browse source
This commit is contained in:
Stephen Birarda 2014-01-17 12:18:41 -08:00
parent 1900d3a13b
commit ffb628edfb
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,6 @@ void signalhandler(int sig){
} }
} }
DomainServer* DomainServer::domainServerInstance = NULL;
const quint16 DOMAIN_SERVER_HTTP_PORT = 8080; const quint16 DOMAIN_SERVER_HTTP_PORT = 8080;
DomainServer::DomainServer(int argc, char* argv[]) : DomainServer::DomainServer(int argc, char* argv[]) :
@ -43,8 +41,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
_metavoxelServerConfig(NULL), _metavoxelServerConfig(NULL),
_hasCompletedRestartHold(false) _hasCompletedRestartHold(false)
{ {
DomainServer::setDomainServerInstance(this);
signal(SIGINT, signalhandler); signal(SIGINT, signalhandler);
const char CUSTOM_PORT_OPTION[] = "-p"; const char CUSTOM_PORT_OPTION[] = "-p";
@ -253,10 +249,6 @@ void DomainServer::readAvailableDatagrams() {
} }
} }
void DomainServer::setDomainServerInstance(DomainServer* domainServer) {
domainServerInstance = domainServer;
}
QJsonObject jsonForSocket(const HifiSockAddr& socket) { QJsonObject jsonForSocket(const HifiSockAddr& socket) {
QJsonObject socketJSON; QJsonObject socketJSON;
@ -322,9 +314,9 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QString&
QJsonObject queuedAssignmentsJSON; QJsonObject queuedAssignmentsJSON;
// add the queued but unfilled assignments to the json // add the queued but unfilled assignments to the json
std::deque<Assignment*>::iterator assignment = domainServerInstance->_assignmentQueue.begin(); std::deque<Assignment*>::iterator assignment = _assignmentQueue.begin();
while (assignment != domainServerInstance->_assignmentQueue.end()) { while (assignment != _assignmentQueue.end()) {
QJsonObject queuedAssignmentJSON; QJsonObject queuedAssignmentJSON;
QString uuidString = uuidStringWithoutCurlyBraces((*assignment)->getUUID()); QString uuidString = uuidStringWithoutCurlyBraces((*assignment)->getUUID());

4
domain-server/src/DomainServer.h
View file

@ -30,15 +30,11 @@ public:
void exit(int retCode = 0); void exit(int retCode = 0);
static void setDomainServerInstance(DomainServer* domainServer);
public slots: public slots:
/// Called by NodeList to inform us that a node has been killed. /// Called by NodeList to inform us that a node has been killed.
void nodeKilled(SharedNodePointer node); void nodeKilled(SharedNodePointer node);
private: private:
static DomainServer* domainServerInstance;
void prepopulateStaticAssignmentFile(); void prepopulateStaticAssignmentFile();
Assignment* matchingStaticAssignmentForCheckIn(const QUuid& checkInUUID, NODE_TYPE nodeType); Assignment* matchingStaticAssignmentForCheckIn(const QUuid& checkInUUID, NODE_TYPE nodeType);
Assignment* deployableAssignmentForRequest(Assignment& requestAssignment); Assignment* deployableAssignmentForRequest(Assignment& requestAssignment);