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

Remove AS stats namespace/Filter DS

Browse source
This commit is contained in:
Atlante45 2015-09-11 15:20:01 +02:00
parent 449d6a04d8
commit 05df84ee67
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
assignment-client/src/assets/AssetServer.cpp
View file

@ -173,13 +173,6 @@ void AssetServer::sendStatsPacket() {
auto endTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(stat.second.endTime); auto endTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(stat.second.endTime);
QDateTime date = QDateTime::fromMSecsSinceEpoch(endTimeMs.count()); QDateTime date = QDateTime::fromMSecsSinceEpoch(endTimeMs.count());
QString uuid = QUuid().toString();
if (auto node = DependencyManager::get<NodeList>()->findNodeWithAddr(stat.first)) {
uuid = uuidStringWithoutCurlyBraces(node->getUUID().toString());
}
nodeStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = uuid;
QJsonObject connectionStats; QJsonObject connectionStats;
connectionStats["lastHeard"] = date.toString(); connectionStats["lastHeard"] = date.toString();
connectionStats["estimatedBandwith"] = stat.second.estimatedBandwith; connectionStats["estimatedBandwith"] = stat.second.estimatedBandwith;
@ -211,11 +204,20 @@ void AssetServer::sendStatsPacket() {
receivingStats["Duplicate"] = stat.second.events[udt::ConnectionStats::Stats::Duplicate]; receivingStats["Duplicate"] = stat.second.events[udt::ConnectionStats::Stats::Duplicate];
nodeStats["receiving"] = receivingStats; nodeStats["receiving"] = receivingStats;
QString uuid;
auto nodelist = DependencyManager::get<NodeList>();
if (stat.first == nodelist->getDomainHandler().getSockAddr()) {
uuid = uuidStringWithoutCurlyBraces(nodelist->getDomainHandler().getUUID());
nodeStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = "DomainServer";
} else {
auto node = nodelist->findNodeWithAddr(stat.first);
uuid = uuidStringWithoutCurlyBraces(node ? node->getUUID() : QUuid());
nodeStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = uuid;
}
serverStats[uuid] = nodeStats; serverStats[uuid] = nodeStats;
} }
// send off the stats packets // send off the stats packets
QJsonObject statsObject; ThreadedAssignment::addPacketStatsAndSendStatsPacket(serverStats);
statsObject["AssetServer"] = serverStats;
ThreadedAssignment::addPacketStatsAndSendStatsPacket(statsObject);
} }