Fix: shared-host respawn block and web login brand placeholder
Two unrelated fixes bundled here. 1. Client respawn (ClientDll.cpp EasyRun/Run, test.cpp Run): after a host is shared or transferred to another server, restarting the master (server A) left the host's main instance stuck, because the respawn loop waited on IsStoped() (g_bThreadExit && GetCount()==0), which never becomes true while a still-alive shared instance holds AddCount(1). S_SERVER_EXIT now triggers an immediate reconnect without waiting for shared instances; client-exit / update still waits for all instances to drain. Verified by 100 restart cycles. 2. Web login page (WebService.cpp): the MFC web server only substituted __BASE_PATH__ in index.html and left __BRAND_NAME__ as a literal token in the login page title/heading. Substitute it with "SimpleRemoter" to match the original branding and the Go server's default. Co-Authored-By: deepseek-v4-pro
This commit is contained in:
1 parent
e5f5720867
commit
33986f4893
3 files changed
+19
-12
No files matched your search
+6
-2
@@ -495,8 +495,12 @@ BOOL Run(const char* argv1, int argv2, const std::string &runCmd)
|
||||
}
|
||||
do {
|
||||
run(ip, port);
|
||||
while (bStop && !bStop() && 0 == status)
|
||||
Sleep(20);
|
||||
if (bExit && bExit() != S_SERVER_EXIT) {
|
||||
// 受控端退出 / 程序更新:等所有实例(含分享实例)退干净,避免下方 FreeLibrary
|
||||
// 卸载 DLL 时残留分享实例线程。主控端重启(S_SERVER_EXIT)则立即重连,不等仍存活的分享实例。
|
||||
while (bStop && !bStop() && 0 == status)
|
||||
Sleep(20);
|
||||
}
|
||||
} while (bExit && !bExit() && 0 == status);
|
||||
|
||||
while (bStop && !bStop() && 1 == status)
|
||||
|
||||
Reference in new issue
Block a user