Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

fix tree parsing

Browse Source
This commit is contained in:
Emagi 2024-12-06 09:31:40 -05:00
parent 2769d97bfe
commit 02946500f9
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/WorldServer/Web/HTTPSClientPool.cpp
View File

@ -572,21 +572,28 @@ void HTTPSClientPool::pollPeerHealth(const std::string& server, const std::strin
} }
// Process Clients // Process Clients
if (json_tree.find("Clients") != json_tree.not_found()) { if (json_tree.find("Clients") != json_tree.not_found()) {
for (const auto& client : json_tree.get_child("Clients")) { std::ostringstream oss;
boost::property_tree::ptree clientTree = client.second; boost::property_tree::write_json(oss, json_tree.get_child("Clients"));
peer_manager.updateClientTree(id, clientTree);
break; // should only be one tree std::istringstream json_stream(oss.str());
} boost::property_tree::ptree zonept;
boost::property_tree::read_json(json_stream, zonept);
peer_manager.updateZoneTree(id, zonept);
} }
// Process Zones // Process Zones
if (json_tree.find("Zones") != json_tree.not_found()) { if (json_tree.find("Zones") != json_tree.not_found()) {
for (const auto& zone : json_tree.get_child("Zones")) { std::ostringstream oss;
boost::property_tree::ptree zoneTree = zone.second; boost::property_tree::write_json(oss, json_tree.get_child("Zones"));
peer_manager.updateZoneTree(id, zoneTree);
break; // should only be one tree std::istringstream json_stream(oss.str());
} boost::property_tree::ptree zonept;
boost::property_tree::read_json(json_stream, zonept);
peer_manager.updateZoneTree(id, zonept);
} }
if (peer_primary && net.is_primary) { if (peer_primary && net.is_primary) {
peer_manager.handlePrimaryConflict(id); peer_manager.handlePrimaryConflict(id);
std::shared_ptr<Peer> hasPrimary = peer_manager.getHealthyPrimaryPeerPtr(); std::shared_ptr<Peer> hasPrimary = peer_manager.getHealthyPrimaryPeerPtr();