mirror of
https://github.com/kunkundi/crossdesk-server.git
synced 2026-10-26 01:34:33 +08:00
Fix crash caused by server leave and rejoin
This commit is contained in:
1 parent
b15017debf
commit
eb816fc133
1 file changed
+8
-1
+8
-1
@@ -176,7 +176,6 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
|
|||||||
std::string user_id = j["user_id"].get<std::string>();
|
std::string user_id = j["user_id"].get<std::string>();
|
||||||
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
|
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
|
||||||
transmission_id.c_str());
|
transmission_id.c_str());
|
||||||
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
|
|
||||||
|
|
||||||
json message = {{"type", "user_leave_transmission"},
|
json message = {{"type", "user_leave_transmission"},
|
||||||
{"transmission_id", transmission_id},
|
{"transmission_id", transmission_id},
|
||||||
@@ -189,6 +188,14 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
|
|||||||
send_msg(transmission_manager_.GetWsHandle(user_id), message);
|
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;
|
break;
|
||||||
}
|
}
|
||||||
case "query_user_id_list"_H: {
|
case "query_user_id_list"_H: {
|
||||||
|
|||||||
Reference in new issue
Block a user