Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 21:35:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename metaverse heartbeat methods

Browse source
This commit is contained in:
Stephen Birarda 2016-05-10 13:03:18 -07:00
parent 3b2a9b7b98
commit 5884e1eadd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -462,7 +462,7 @@ void DomainServer::setupAutomaticNetworking() {
nodeList->startSTUNPublicSocketUpdate(); nodeList->startSTUNPublicSocketUpdate();
} else { } else {
// send our heartbeat to data server so it knows what our network settings are // send our heartbeat to data server so it knows what our network settings are
sendHeartbeatToDataServer(); sendHeartbeatToMetaverse();
} }
} else { } else {
qDebug() << "Cannot enable domain-server automatic networking without a domain ID." qDebug() << "Cannot enable domain-server automatic networking without a domain ID."
@ -471,7 +471,7 @@ void DomainServer::setupAutomaticNetworking() {
return; return;
} }
} else { } else {
sendHeartbeatToDataServer(); sendHeartbeatToMetaverse();
} }
qDebug() << "Updating automatic networking setting in domain-server to" << _automaticNetworkingSetting; qDebug() << "Updating automatic networking setting in domain-server to" << _automaticNetworkingSetting;
@ -480,7 +480,7 @@ void DomainServer::setupAutomaticNetworking() {
const int DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS = 15 * 1000; const int DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS = 15 * 1000;
QTimer* dataHeartbeatTimer = new QTimer(this); QTimer* dataHeartbeatTimer = new QTimer(this);
connect(dataHeartbeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartbeatToDataServer())); connect(dataHeartbeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartbeatToMetaverse()));
dataHeartbeatTimer->start(DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS); dataHeartbeatTimer->start(DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS);
} }
@ -1029,11 +1029,11 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) {
const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking"; const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking";
void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) { void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) {
sendHeartbeatToDataServer(newPublicSockAddr.getAddress().toString()); sendHeartbeatToMetaverse(newPublicSockAddr.getAddress().toString());
} }
void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) { void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
const QString DOMAIN_UPDATE = "/api/v1/domains/%1"; const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
auto nodeList = DependencyManager::get<LimitedNodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();

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

@ -71,7 +71,7 @@ private slots:
void sendPendingTransactionsToServer(); void sendPendingTransactionsToServer();
void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr); void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr);
void sendHeartbeatToDataServer() { sendHeartbeatToDataServer(QString()); } void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString()); }
void sendHeartbeatToIceServer(); void sendHeartbeatToIceServer();
void handleConnectedNode(SharedNodePointer newNode); void handleConnectedNode(SharedNodePointer newNode);
@ -103,7 +103,7 @@ private:
void setupAutomaticNetworking(); void setupAutomaticNetworking();
void setupICEHeartbeatForFullNetworking(); void setupICEHeartbeatForFullNetworking();
void sendHeartbeatToDataServer(const QString& networkAddress); void sendHeartbeatToMetaverse(const QString& networkAddress);
void randomizeICEServerAddress(bool shouldTriggerHostLookup); void randomizeICEServerAddress(bool shouldTriggerHostLookup);