scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-11-03 04:07:45 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

https://telecominfraproject.atlassian.net/browse/WIFI-11303

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-11-17 21:27:53 -08:00
parent ad1bc551db
commit 66f4742ca5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -1 +1 @@
29 30

9
src/framework/UI_WebSocketClientServer.cpp
View File

@@ -25,7 +25,7 @@ namespace OpenWifi {
void UI_WebSocketClientServer::NewClient(Poco::Net::WebSocket & WS, const std::string &Id, const std::string &UserName ) { void UI_WebSocketClientServer::NewClient(Poco::Net::WebSocket & WS, const std::string &Id, const std::string &UserName ) {
std::lock_guard G(Mutex_); std::lock_guard G(LocalMutex_);
auto Client = std::make_unique<UI_WebSocketClientInfo>(WS,Id, UserName); auto Client = std::make_unique<UI_WebSocketClientInfo>(WS,Id, UserName);
auto ClientSocket = Client->WS_->impl()->sockfd(); auto ClientSocket = Client->WS_->impl()->sockfd();
@@ -89,7 +89,8 @@ namespace OpenWifi {
GoogleApiKey_ = MicroServiceConfigGetString("google.apikey",""); GoogleApiKey_ = MicroServiceConfigGetString("google.apikey","");
GeoCodeEnabled_ = !GoogleApiKey_.empty(); GeoCodeEnabled_ = !GoogleApiKey_.empty();
ReactorThread_.start(Reactor_); ReactorThread_.start(Reactor_);
Thr_.start(*this); ReactorThread_.setName("ws:ui-reactor");
// Thr_.start(*this);
return 0; return 0;
}; };
@@ -100,8 +101,8 @@ namespace OpenWifi {
Reactor_.stop(); Reactor_.stop();
ReactorThread_.join(); ReactorThread_.join();
Running_ = false; Running_ = false;
Thr_.wakeUp(); // Thr_.wakeUp();
Thr_.join(); // Thr_.join();
poco_information(Logger(),"Stopped..."); poco_information(Logger(),"Stopped...");
} }
}; };