Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

make sure peers have latest peering data for client connections

Browse Source
This commit is contained in:
Emagi 2024-12-02 21:37:05 -05:00
parent a582ff2f28
commit 89fe9bf71b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,6 +525,9 @@ void HTTPSClientPool::pollPeerHealth(const std::string& server, const std::strin
std::string online_status; std::string online_status;
int16 peer_priority = 65535; int16 peer_priority = 65535;
bool peer_primary = false; bool peer_primary = false;
std::string worldAddr(""), internalWorldAddr(""), clientIP("");
int16 worldPort = 0;
if (auto status = json_tree.get_optional<std::string>("world_status")) { if (auto status = json_tree.get_optional<std::string>("world_status")) {
online_status = status.get(); online_status = status.get();
} }
@ -534,6 +537,18 @@ void HTTPSClientPool::pollPeerHealth(const std::string& server, const std::strin
if (auto isprimary = json_tree.get_optional<bool>("peer_primary")) { if (auto isprimary = json_tree.get_optional<bool>("peer_primary")) {
peer_primary = isprimary.get(); peer_primary = isprimary.get();
} }
if (auto peerclientaddr = tree.get_optional<std::string>("peer_client_address")) {
worldAddr = peerclientaddr.get();
}
if (auto peerclient_internaladdr = tree.get_optional<std::string>("peer_client_internal_address")) {
internalWorldAddr = peerclient_internaladdr.get();
}
if (auto peerclientport = tree.get_optional<int16>("peer_client_port")) {
worldPort = peerclientport.get();
}
if(worldAddr.size() > 0 && worldPort > 0) {
peer_manager.updatePeer(server, web_worldport, worldAddr, internalWorldAddr, worldPort, peer_primary);
}
peer_manager.updatePriority(id, peer_priority); peer_manager.updatePriority(id, peer_priority);
if (peer_primary && net.is_primary) { if (peer_primary && net.is_primary) {

3
source/WorldServer/Web/WorldWeb.cpp
View File

@ -66,6 +66,9 @@ void World::Web_worldhandle_status(const http::request<http::string_body>& req,
pt.put("world_reloading", world.IsReloadingSubsystems() ? "yes" : "no"); pt.put("world_reloading", world.IsReloadingSubsystems() ? "yes" : "no");
pt.put("peer_primary", net.is_primary); pt.put("peer_primary", net.is_primary);
pt.put("peer_priority", net.GetPeerPriority()); pt.put("peer_priority", net.GetPeerPriority());
pt.put("peer_client_address", std::string(net.GetWorldAddress()));
pt.put("peer_client_internal_address", std::string(net.GetInternalWorldAddress()));
pt.put("peer_client_port", std::to_string(net.GetWorldPort()));
std::ostringstream oss; std::ostringstream oss;
boost::property_tree::write_json(oss, pt); boost::property_tree::write_json(oss, pt);