YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash caused by server leave and rejoin

Browse Source
This commit is contained in:
dijunkun
2023-10-11 17:30:29 +08:00
parent 34274001dc
commit 48b1d025fc
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/signal_server/signal_server.cpp
View File

@@ -176,7 +176,6 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
std::string user_id = j["user_id"].get<std::string>();
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
transmission_id.c_str());
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
json message = {{"type", "user_leave_transmission"},
{"transmission_id", transmission_id},
@@ -189,6 +188,14 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
send_msg(transmission_manager_.GetWsHandle(user_id), message);
}
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
if (std::string::npos != user_id.find("S-")) {
transmission_list_.erase(transmission_id);
transmission_manager_.ReleaseAllUserIdFromTransmission(transmission_id);
LOG_INFO("Release transmission [{}] due to server leaves",
transmission_id);
}
break;
}
case "query_user_id_list"_H: {