diff --git a/build b/build index 9a03714..9d60796 100644 --- a/build +++ b/build @@ -1 +1 @@ -10 \ No newline at end of file +11 \ No newline at end of file diff --git a/src/framework/UI_WebSocketClientServer.cpp b/src/framework/UI_WebSocketClientServer.cpp index 6b22dfa..a9346e5 100644 --- a/src/framework/UI_WebSocketClientServer.cpp +++ b/src/framework/UI_WebSocketClientServer.cpp @@ -25,7 +25,7 @@ namespace OpenWifi { 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(WS,Id, UserName); auto ClientSocket = Client->WS_->impl()->sockfd(); @@ -89,7 +89,8 @@ namespace OpenWifi { GoogleApiKey_ = MicroServiceConfigGetString("google.apikey",""); GeoCodeEnabled_ = !GoogleApiKey_.empty(); ReactorThread_.start(Reactor_); - Thr_.start(*this); + ReactorThread_.setName("ws:ui-reactor"); + // Thr_.start(*this); return 0; }; @@ -100,8 +101,8 @@ namespace OpenWifi { Reactor_.stop(); ReactorThread_.join(); Running_ = false; - Thr_.wakeUp(); - Thr_.join(); + // Thr_.wakeUp(); + // Thr_.join(); poco_information(Logger(),"Stopped..."); } };