krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Master] Minor fixes

Browse source
This commit is contained in:
Koncord 2017-09-13 17:56:38 +08:00
parent cccbe753d7
commit 838e05521e
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/master/AdminRest.cpp
View file

@ -58,10 +58,12 @@ void AdminRest::start()
*response << response400;
};
httpServer.start();
thr = thread([this](){httpServer.start();});
}
void AdminRest::stop()
{
httpServer.stop();
if(thr.joinable())
thr.join();
}

1
apps/master/AdminRest.hpp
View file

@ -19,6 +19,7 @@ public:
private:
HttpsServer httpServer;
std::shared_ptr<MasterServer> master;
std::thread thr;
};

4
apps/master/RestServer.cpp
View file

@ -167,7 +167,7 @@ void RestServer::start()
*response << response400;
};
httpServer.start();
thr = thread([this](){httpServer.start();});
}
void RestServer::cacheUpdated()
@ -178,4 +178,6 @@ void RestServer::cacheUpdated()
void RestServer::stop()
{
httpServer.stop();
if(thr.joinable())
thr.join();
}

1
apps/master/RestServer.hpp
View file

@ -24,6 +24,7 @@ private:
HttpServer httpServer;
MasterServer::ServerMap *serverMap;
bool updatedCache = true;
std::thread thr;
};

8
apps/master/main.cpp
View file

@ -67,12 +67,8 @@ int main(int argc, char* argv[])
signal(SIGTERM, onExit);
masterServer->Start();
thread rest_thread([]() { restServer->start();});
thread restAdmin_thread([]() { restAdminServer->start();});
rest_thread.join();
restAdmin_thread.join();
restServer->start();
restAdminServer->start();
masterServer->Wait();
return 0;