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

Merge pull request #8290 from howard-stearns/cleanup-heartbeat

Browse source 
cleanup domain-server heartbeat code
This commit is contained in:
Brad Hefta-Gaub 2016-07-21 18:17:19 -07:00 committed by GitHub
commit c24472d390
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1086,8 +1086,8 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
// add the versions
static const QString VERSION_KEY = "version";
domainObject[VERSION_KEY] = BuildInfo::VERSION;
static const QString PROTOCOL_KEY = "protocol";
domainObject[PROTOCOL_KEY] = protocolVersionsSignatureBase64();
static const QString PROTOCOL_VERSION_KEY = "protocol";
domainObject[PROTOCOL_VERSION_KEY] = protocolVersionsSignatureBase64();
// add networking
if (!networkAddress.isEmpty()) {
@ -1121,12 +1121,7 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
QString domainUpdateJSON = QString("{\"domain\":%1}").arg(QString(QJsonDocument(domainObject).toJson(QJsonDocument::Compact)));
static const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
QString path = DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(getID()));
#if DEV_BUILD || PR_BUILD
qDebug() << "Domain metadata sent to" << path;
qDebug() << "Domain metadata update:" << domainUpdateJSON;
#endif
DependencyManager::get<AccountManager>()->sendRequest(path,
DependencyManager::get<AccountManager>()->sendRequest(DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(getID())),
AccountManagerAuth::Optional,
QNetworkAccessManager::PutOperation,
JSONCallbackParameters(nullptr, QString(), this, "handleMetaverseHeartbeatError"),

2
libraries/networking/src/UserActivityLogger.cpp
View file

@ -179,7 +179,7 @@ void UserActivityLogger::wentTo(AddressManager::LookupTrigger lookupTrigger, QSt
trigger = "StartupFromSettings";
break;
case AddressManager::Suggestions:
trigger = "Suggesions";
trigger = "Suggestions";
break;
default:
return;