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

send a simple heartbeat if location has not changed

Browse source
This commit is contained in:
Stephen Birarda 2016-05-06 11:50:40 -07:00
parent a5d09e268d
commit 7dd8515bd8
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
interface/src/DiscoverabilityManager.cpp
View file

@ -30,6 +30,7 @@ DiscoverabilityManager::DiscoverabilityManager() :
} }
const QString API_USER_LOCATION_PATH = "/api/v1/user/location"; const QString API_USER_LOCATION_PATH = "/api/v1/user/location";
const QString API_USER_HEARTBEAT_PATH = "/api/v1/user/heartbeat";
const QString SESSION_ID_KEY = "session_id"; const QString SESSION_ID_KEY = "session_id";
@ -48,7 +49,6 @@ void DiscoverabilityManager::updateLocation() {
QJsonObject locationObject; QJsonObject locationObject;
QString pathString = addressManager->currentPath(); QString pathString = addressManager->currentPath();
const QString LOCATION_KEY_IN_ROOT = "location"; const QString LOCATION_KEY_IN_ROOT = "location";
@ -78,16 +78,33 @@ void DiscoverabilityManager::updateLocation() {
const QString FRIENDS_ONLY_KEY_IN_LOCATION = "friends_only"; const QString FRIENDS_ONLY_KEY_IN_LOCATION = "friends_only";
locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends)); locationObject.insert(FRIENDS_ONLY_KEY_IN_LOCATION, (_mode.get() == Discoverability::Friends));
rootObject.insert(LOCATION_KEY_IN_ROOT, locationObject); // if we have a session ID add it now, otherwise add a null value
rootObject[SESSION_ID_KEY] = _sessionID.isEmpty() ? QJsonValue() : _sessionID;
accountManager.sendRequest(API_USER_LOCATION_PATH, AccountManagerAuth::Required,
JSONCallbackParameters callbackParameters;
callbackParameters.jsonCallbackReceiver = this;
callbackParameters.jsonCallbackMethod = "handleHeartbeatResponse";
// figure out if we'll send a fresh location or just a simple heartbeat
auto apiPath = API_USER_HEARTBEAT_PATH;
if (locationObject != _lastLocationObject) {
// we have a changed location, send it now
_lastLocationObject = locationObject;
rootObject.insert(LOCATION_KEY_IN_ROOT, locationObject);
apiPath = API_USER_LOCATION_PATH;
}
accountManager.sendRequest(apiPath, AccountManagerAuth::Required,
QNetworkAccessManager::PutOperation, QNetworkAccessManager::PutOperation,
JSONCallbackParameters(), QJsonDocument(rootObject).toJson()); callbackParameters, QJsonDocument(rootObject).toJson());
} }
} else if (UserActivityLogger::getInstance().isEnabled()) { } else if (UserActivityLogger::getInstance().isEnabled()) {
// we still send a heartbeat to the metaverse server for stats collection // we still send a heartbeat to the metaverse server for stats collection
const QString API_USER_HEARTBEAT_PATH = "/api/v1/user/heartbeat";
JSONCallbackParameters callbackParameters; JSONCallbackParameters callbackParameters;
callbackParameters.jsonCallbackReceiver = this; callbackParameters.jsonCallbackReceiver = this;

1
interface/src/DiscoverabilityManager.h
View file

@ -50,6 +50,7 @@ private:
Setting::Handle<int> _mode; Setting::Handle<int> _mode;
QString _sessionID; QString _sessionID;
QJsonObject _lastLocationObject;
}; };
#endif // hifi_DiscoverabilityManager_h #endif // hifi_DiscoverabilityManager_h