pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UCS] Auto Client Reconnection (#2154)

Browse Source
This commit is contained in:
Chris Miles
2022-05-07 22:24:11 -05:00
committed by GitHub
parent 9f9eaed983
commit 07b46ed445
4 changed files with 129 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucs/ucs.cpp
+42 -21
View File
@@ -32,6 +32,8 @@
#include "worldserver.h"
#include <list>
#include <signal.h>
#include <csignal>
#include <thread>
#include "../common/net/tcp_server.h"
#include "../common/net/servertalk_client_connection.h"
@@ -49,19 +51,43 @@ std::string WorldShortName;
uint32 ChatMessagesSent = 0;
uint32 MailMessagesSent = 0;
volatile bool RunLoops = true;
void CatchSignal(int sig_num) {
RunLoops = false;
}
std::string GetMailPrefix() {
return "SOE.EQ." + WorldShortName + ".";
}
void crash_func() {
std::this_thread::sleep_for(std::chrono::milliseconds(10000));
int* p=0;
*p=0;
}
void Shutdown() {
LogInfo("Shutting down...");
ChannelList->RemoveAllChannels();
g_Clientlist->CloseAllConnections();
LogSys.CloseFileLogs();
}
int caught_loop = 0;
void CatchSignal(int sig_num) {
LogInfo("Caught signal [{}]", sig_num);
EQ::EventLoop::Get().Shutdown();
caught_loop++;
// when signal handler is incapable of exiting properly
if (caught_loop > 1) {
LogInfo("In a signal handler loop and process is incapable of exiting properly, forcefully cleaning up");
ChannelList->RemoveAllChannels();
g_Clientlist->CloseAllConnections();
LogSys.CloseFileLogs();
std::exit(0);
}
}
int main() {
RegisterExecutablePlatform(ExePlatformUCS);
LogSys.LoadLogSettingsDefaults();
@@ -134,17 +160,17 @@ int main() {
database.LoadChatChannels();
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
LogInfo("Could not set signal handler");
return 1;
}
if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
LogInfo("Could not set signal handler");
return 1;
}
std::signal(SIGINT, CatchSignal);
std::signal(SIGTERM, CatchSignal);
std::signal(SIGKILL, CatchSignal);
std::signal(SIGSEGV, CatchSignal);
worldserver = new WorldServer;
// uncomment to simulate timed crash for catching SIGSEV
// std::thread crash_test(crash_func);
// crash_test.detach();
auto loop_fn = [&](EQ::Timer* t) {
Timer::SetCurrentTime();
@@ -166,12 +192,7 @@ int main() {
EQ::EventLoop::Get().Run();
ChannelList->RemoveAllChannels();
g_Clientlist->CloseAllConnections();
LogSys.CloseFileLogs();
Shutdown();
}
void UpdateWindowTitle(char* iNewTitle) {