Chg: update image tag in helm values to v2.6.0-RC3

FIX: https://telecominfraproject.atlassian.net/browse/WIFI-9553

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owanalytics VERSION 2.7.0)
+project(owanalytics VERSION 2.6.0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_GENERATOR "Unix Makefiles")

build

@@ -1 +1 @@
-3
+69

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owanalytics:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owanalytics
-    tag: main
+    tag: v2.6.0-RC3
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

openapi/owanalytics.yaml

@@ -27,13 +27,71 @@ components:
 
   responses:
     NotFound:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/NotFound'
+      description: The specified resource was not found.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
     Unauthorized:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Unauthorized'
+      description: The requested does not have sufficient rights to perform the operation.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+                enum:
+                  - 0     # Success
+                  - 1     # PASSWORD_CHANGE_REQUIRED,
+                  - 2     # INVALID_CREDENTIALS,
+                  - 3     # PASSWORD_ALREADY_USED,
+                  - 4     # USERNAME_PENDING_VERIFICATION,
+                  - 5     # PASSWORD_INVALID,
+                  - 6     # INTERNAL_ERROR,
+                  - 7     # ACCESS_DENIED,
+                  - 8     # INVALID_TOKEN
+                  - 9     # EXPIRED_TOKEN
+                  - 10    # RATE_LIMIT_EXCEEDED
+                  - 11    # BAD_MFA_TRANSACTION
+                  - 12    # MFA_FAILURE
+                  - 13    # SECURITY_SERVICE_UNREACHABLE
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
     Success:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Success'
+      description: The requested operation was performed.
+      content:
+        application/json:
+          schema:
+            properties:
+              Operation:
+                type: string
+              Details:
+                type: string
+              Code:
+                type: integer
+
     BadRequest:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/BadRequest'
+      description: The requested operation failed.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: integer
 
   schemas:
     ObjectInfo:

src/DeviceStatusReceiver.cpp

@@ -23,7 +23,6 @@ namespace OpenWifi {
     }
 
     void DeviceStatusReceiver::run() {
-        Utils::SetThreadName("dev-status");
         Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
         while(Note && Running_) {
             auto Msg = dynamic_cast<DeviceStatusMessage *>(Note.get());

src/HealthReceiver.cpp

@@ -23,7 +23,6 @@ namespace OpenWifi {
     }
 
     void HealthReceiver::run() {
-        Utils::SetThreadName("dev-health");
         Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
         while(Note && Running_) {
             auto Msg = dynamic_cast<HealthMessage *>(Note.get());

src/StateReceiver.cpp

@@ -25,7 +25,6 @@ namespace OpenWifi {
 
     void StateReceiver::run() {
         Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-        Utils::SetThreadName("dev-state");
         while(Note && Running_) {
             auto Msg = dynamic_cast<StateMessage *>(Note.get());
             if(Msg!= nullptr) {

src/StorageService.cpp

@@ -66,7 +66,6 @@ namespace OpenWifi {
     }
 
     void Storage::run() {
-        Utils::SetThreadName("strg-updtr");
 	    Running_ = true ;
 	    bool FirstRun=true;
 	    long Retry = 2000;

src/VenueCoordinator.cpp

@@ -34,7 +34,6 @@ namespace OpenWifi {
     }
 
     void VenueCoordinator::run() {
-        Utils::SetThreadName("venue-coord");
         Running_=true;
         while(Running_) {
             Poco::Thread::trySleep(20000);

src/VenueWatcher.cpp

@@ -34,7 +34,6 @@ namespace OpenWifi {
     }
 
     void VenueWatcher::run() {
-        Utils::SetThreadName("venue-watch");
         Running_ = true;
         Poco::AutoPtr<Poco::Notification>	Msg(Queue_.waitDequeueNotification());
         while(Msg && Running_) {

src/framework/MicroService.h

@@ -27,11 +27,6 @@ namespace OpenWifi {
     inline uint64_t Now() { return std::time(nullptr); };
 }
 
-namespace OpenWifi::Utils {
-    std::vector<unsigned char> base64decode(const std::string& input);
-    std::string base64encode(const unsigned char *input, uint32_t size);
-}
-
 using namespace std::chrono_literals;
 
 #include "Poco/Util/Application.h"
@@ -243,11 +238,6 @@ namespace OpenWifi::RESTAPI_utils {
         Obj.set(Field,Value);
     }
 
-    inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Poco::Data::BLOB &Value) {
-        auto Result = Utils::base64encode((const unsigned char *)Value.rawContent(),Value.size());
-        Obj.set(Field,Result);
-    }
-
     inline void field_to_json(Poco::JSON::Object &Obj, const char *Field, const Types::StringPairVec & S) {
         Poco::JSON::Array   Array;
         for(const auto &i:S) {
@@ -344,12 +334,12 @@ namespace OpenWifi::RESTAPI_utils {
 
     inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, double & Value) {
         if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (double)Obj->get(Field);
+            Value = (double) Obj->get(Field);
     }
 
     inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, float & Value) {
         if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (float)Obj->get(Field);
+            Value = (float) Obj->get(Field);
     }
 
     inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, bool &Value) {
@@ -384,14 +374,7 @@ namespace OpenWifi::RESTAPI_utils {
 
     inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, uint64_t &Value) {
         if(Obj->has(Field) && !Obj->isNull(Field))
-            Value = (uint64_t)Obj->get(Field);
-    }
-
-    inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Poco::Data::BLOB &Value) {
-        if(Obj->has(Field) && !Obj->isNull(Field)) {
-            auto Result = Utils::base64decode(Obj->get(Field).toString());
-            Value.assignRaw((const unsigned char *)&Result[0],Result.size());
-        }
+            Value = (uint64_t ) Obj->get(Field);
     }
 
     inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringPairVec &Vec) {
@@ -660,27 +643,6 @@ namespace OpenWifi::RESTAPI_utils {
 
 namespace OpenWifi::Utils {
 
-	inline void SetThreadName(const char *name) {
-#ifdef __linux__
-		Poco::Thread::current()->setName(name);
-		pthread_setname_np(pthread_self(), name);
-#endif
-#ifdef __APPLE__
-	Poco::Thread::current()->setName(name);
-	pthread_setname_np(name);
-#endif
-	}
-
-	inline void SetThreadName(Poco::Thread &thr, const char *name) {
-#ifdef __linux__
-		thr.setName(name);
-		pthread_setname_np(thr.tid(), name);
-#endif
-#ifdef __APPLE__
-		thr.setName(name);
-#endif
-	}
-
     enum MediaTypeEncodings {
         PLAIN,
         BINARY,
@@ -1354,7 +1316,7 @@ namespace OpenWifi {
 		inline void Start();
 		inline void Stop();
 	  private:
-		mutable std::atomic_bool 	Running_ = false;
+		std::atomic_bool 	Running_ = false;
 		Poco::Thread		Thread_;
 	};
 
@@ -1399,14 +1361,13 @@ namespace OpenWifi {
 
 	    [[nodiscard]] inline const std::string &Address() const { return address_; };
 	    [[nodiscard]] inline uint32_t Port() const { return port_; };
-	    [[nodiscard]] inline auto KeyFile() const { return key_file_; };
-	    [[nodiscard]] inline auto CertFile() const { return cert_file_; };
-	    [[nodiscard]] inline auto RootCA() const { return root_ca_; };
-	    [[nodiscard]] inline auto KeyFilePassword() const { return key_file_password_; };
-	    [[nodiscard]] inline auto IssuerCertFile() const { return issuer_cert_file_; };
-	    [[nodiscard]] inline auto Name() const { return name_; };
+	    [[nodiscard]] inline const std::string &KeyFile() const { return key_file_; };
+	    [[nodiscard]] inline const std::string &CertFile() const { return cert_file_; };
+	    [[nodiscard]] inline const std::string &RootCA() const { return root_ca_; };
+	    [[nodiscard]] inline const std::string &KeyFilePassword() const { return key_file_password_; };
+	    [[nodiscard]] inline const std::string &IssuerCertFile() const { return issuer_cert_file_; };
+	    [[nodiscard]] inline const std::string &Name() const { return name_; };
 	    [[nodiscard]] inline int Backlog() const { return backlog_; }
-		[[nodiscard]] inline auto Cas() const { return cas_; }
 
 	    [[nodiscard]] inline Poco::Net::SecureServerSocket CreateSecureSocket(Poco::Logger &L) const {
 	        Poco::Net::Context::Params P;
@@ -1886,8 +1847,7 @@ namespace OpenWifi {
 	            Request = &RequestIn;
 	            Response = &ResponseIn;
 
-//				std::string th_name = "restsvr_" + std::to_string(TransactionId_);
-//				Utils::SetThreadName(th_name.c_str());
+				Poco::Thread::current()->setName("WebServerThread_" + std::to_string(TransactionId_));
 
                 if(Request->getContentLength()>0) {
                     if(Request->getContentType().find("application/json")!=std::string::npos) {
@@ -2082,17 +2042,6 @@ namespace OpenWifi {
             return false;
         }
 
-        static inline bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, Poco::Data::BLOB &Value) {
-            if(O->has(Field)) {
-                std::string Content = O->get(Field).toString();
-                auto DecodedBlob = Utils::base64decode(Content);
-                Value.assignRaw((const unsigned char *)&DecodedBlob[0],DecodedBlob.size());
-                return true;
-            }
-            return false;
-        }
-
-
         template <typename T> bool AssignIfPresent(const Poco::JSON::Object::Ptr &O, const std::string &Field, const T &value, T & assignee) {
             if(O->has(Field)) {
                 assignee = value;
@@ -2630,7 +2579,7 @@ namespace OpenWifi {
     private:
         std::recursive_mutex  	Mutex_;
         Poco::Thread        	Worker_;
-        mutable std::atomic_bool    	Running_=false;
+        std::atomic_bool    	Running_=false;
 		Poco::NotificationQueue	Queue_;
     };
 
@@ -2656,7 +2605,7 @@ namespace OpenWifi {
 	  private:
 		std::recursive_mutex  	Mutex_;
         Poco::Thread        	Worker_;
-        mutable std::atomic_bool    	Running_=false;
+        std::atomic_bool    	Running_=false;
     };
 
 	class KafkaDispatcher : public Poco::Runnable {
@@ -2713,7 +2662,6 @@ namespace OpenWifi {
 
 		inline void run() override {
 			Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
-			Utils::SetThreadName("kafka:dispatch");
 			while(Note && Running_) {
 				auto Msg = dynamic_cast<KafkaMessage*>(Note.get());
 				if(Msg!= nullptr) {
@@ -2739,7 +2687,7 @@ namespace OpenWifi {
 		std::recursive_mutex  	Mutex_;
 		Types::NotifyTable      Notifiers_;
 		Poco::Thread        	Worker_;
-		mutable std::atomic_bool    	Running_=false;
+		std::atomic_bool    	Running_=false;
 		uint64_t          		FunctionId_=1;
 		Poco::NotificationQueue	Queue_;
 	};
@@ -2934,7 +2882,6 @@ namespace OpenWifi {
 
 	            void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response) override
 	            {
-					Utils::SetThreadName("alb-request");
 					try {
 						if((id_ % 100) == 0) {
 							Logger_.debug(fmt::format("ALB-REQUEST({}): ALB Request {}.",
@@ -3003,7 +2950,7 @@ namespace OpenWifi {
 	    std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
 	    std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
 	    int                                     	Port_ = 0;
-	    mutable std::atomic_bool                            Running_=false;
+	    std::atomic_bool                            Running_=false;
 	};
 
 	inline auto ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
@@ -3035,17 +2982,18 @@ namespace OpenWifi {
 
 	    inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) {
 	        RESTAPIHandler::BindingMap Bindings;
-			Utils::SetThreadName(fmt::format("x-rest:{}",Id).c_str());
+			Poco::Thread::current()->setName(fmt::format("RESTAPI_ExtServer_{}",Id));
 	        return RESTAPI_ExtRouter(Path, Bindings, Logger(), Server_, Id);
 	    }
 
 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"x-rest",2,32};
+	    Poco::ThreadPool	    Pool_;
 	    RESTAPI_GenericServer   Server_;
 
         RESTAPI_ExtServer() noexcept:
-	    SubSystemServer("RESTAPI_ExtServer", "REST-XSRV", "openwifi.restapi")
+	    SubSystemServer("RESTAPI_ExtServer", "RESTAPIServer", "openwifi.restapi"),
+        Pool_("RESTAPI_ExtServer",4,50,120)
             {
             }
 	};
@@ -3058,7 +3006,7 @@ namespace OpenWifi {
 	    inline Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override {
 			try {
 				Poco::URI uri(Request.getURI());
-				Utils::SetThreadName(fmt::format("x-rest:{}",TransactionId_).c_str());
+				Poco::Thread::current()->setName(fmt::format("ExtWebServer_{}",TransactionId_));
 				return RESTAPI_ExtServer()->CallServer(uri.getPath(), TransactionId_++);
 			} catch (...) {
 
@@ -3167,16 +3115,17 @@ namespace OpenWifi {
 
 	    inline Poco::Net::HTTPRequestHandler *CallServer(const std::string &Path, uint64_t Id) {
 	        RESTAPIHandler::BindingMap Bindings;
-			Utils::SetThreadName(fmt::format("i-rest:{}",Id).c_str());
+			Poco::Thread::current()->setName(fmt::format("RESTAPI_IntServer_{}",Id));
 	        return RESTAPI_IntRouter(Path, Bindings, Logger(), Server_, Id);
 	    }
 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"i-rest",2,16};
+	    Poco::ThreadPool	    Pool_;
 	    RESTAPI_GenericServer   Server_;
 
         RESTAPI_IntServer() noexcept:
-		   SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi")
+		   SubSystemServer("RESTAPI_IntServer", "REST-ISRV", "openwifi.internal.restapi"),
+            Pool_("RESTAPI_IntServer",4,50,120)
         {
         }
 	};
@@ -3187,7 +3136,6 @@ namespace OpenWifi {
 	public:
         inline IntRequestHandlerFactory() = default;
 	    inline Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &Request) override {
-			Utils::SetThreadName(fmt::format("i-rest:{}",TransactionId_).c_str());
 	        Poco::URI uri(Request.getURI());
 	        return RESTAPI_IntServer()->CallServer(uri.getPath(), TransactionId_);
 	    }
@@ -3231,6 +3179,7 @@ namespace OpenWifi {
 		}
 
 		[[nodiscard]] std::string Version() { return Version_; }
+		// [[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
 		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
 		[[nodiscard]] inline const std::string & WWWAssetsDir() { return WWWAssetsDir_; }
 		[[nodiscard]] bool Debug() const { return DebugMode_; }
@@ -3263,12 +3212,7 @@ namespace OpenWifi {
             return Poco::Logger::get(Name);
         }
 
-        virtual void GetExtraConfiguration(Poco::JSON::Object & Cfg) {
-            Cfg.set("additionalConfiguration",false);
-        }
-
-
-        static inline void Exit(int Reason);
+		static inline void Exit(int Reason);
 		inline void BusMessageReceived(const std::string &Key, const std::string & Payload);
 		inline MicroServiceMetaVec GetServices(const std::string & Type);
 		inline MicroServiceMetaVec GetServices();
@@ -3334,9 +3278,6 @@ namespace OpenWifi {
                 return Signer_.sign(T,Algo);
             }
         }
-
-		inline Poco::ThreadPool & TimerPool() { return TimerPool_; }
-
 	  private:
 	    static MicroService         * instance_;
 		bool                        HelpRequested_ = false;
@@ -3371,7 +3312,6 @@ namespace OpenWifi {
         bool                        NoBuiltInCrypto_=false;
         Poco::JWT::Signer	        Signer_;
 		Poco::Logger				&Logger_;
-		Poco::ThreadPool			TimerPool_{"timer:pool",2,16};
     };
 
 	inline void MicroService::Exit(int Reason) {
@@ -3584,7 +3524,7 @@ namespace OpenWifi {
     void DaemonPostInitialization(Poco::Util::Application &self);
 
 	inline void MicroService::initialize(Poco::Util::Application &self) {
-		// add the default services
+	    // add the default services
         LoadConfigurationFile();
         InitializeLoggingSystem();
 
@@ -3925,7 +3865,6 @@ namespace OpenWifi {
             Params->setMaxThreads(50);
             Params->setMaxQueued(200);
             Params->setKeepAlive(true);
-			Params->setName("ws:xrest");
 
             std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
             if(MicroService::instance().NoAPISecurity()) {
@@ -3962,7 +3901,6 @@ namespace OpenWifi {
             Params->setMaxThreads(50);
             Params->setMaxQueued(200);
             Params->setKeepAlive(true);
-			Params->setName("ws:irest");
 
             std::unique_ptr<Poco::Net::HTTPServer>  NewServer;
             if(MicroService::instance().NoAPISecurity()) {
@@ -3980,6 +3918,7 @@ namespace OpenWifi {
     }
 
     inline int MicroService::main([[maybe_unused]] const ArgVec &args) {
+
 	    MyErrorHandler	ErrorHandler(*this);
 	    Poco::ErrorHandler::set(&ErrorHandler);
 
@@ -4086,7 +4025,6 @@ namespace OpenWifi {
 	        Port_ = (int)MicroService::instance().ConfigGetInt("alb.port",15015);
 	        Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
 	        auto Params = new Poco::Net::HTTPServerParams;
-			Params->setName("ws:alb");
 	        Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger()), *Socket_, Params);
 	        Server_->start();
 	    }
@@ -4096,7 +4034,6 @@ namespace OpenWifi {
 
     inline void BusEventManager::run() {
         Running_ = true;
-		Utils::SetThreadName("fmwk:EventMgr");
         auto Msg = MicroService::instance().MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
         KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,MicroService::instance().PrivateEndPoint(),Msg, false);
         while(Running_) {
@@ -4182,8 +4119,6 @@ namespace OpenWifi {
 	}
 
 	inline void KafkaProducer::run() {
-
-		Utils::SetThreadName("Kafka:Prod");
 	    cppkafka::Configuration Config({
             { "client.id", MicroService::instance().ConfigGetString("openwifi.kafka.client.id") },
             { "metadata.broker.list", MicroService::instance().ConfigGetString("openwifi.kafka.brokerlist") }
@@ -4222,8 +4157,6 @@ namespace OpenWifi {
 	}
 
 	inline void KafkaConsumer::run() {
-		Utils::SetThreadName("Kafka:Cons");
-
 	    cppkafka::Configuration Config({
 	        { "client.id", MicroService::instance().ConfigGetString("openwifi.kafka.client.id") },
 	        { "metadata.broker.list", MicroService::instance().ConfigGetString("openwifi.kafka.brokerlist") },
@@ -4362,11 +4295,6 @@ namespace OpenWifi {
 	            Answer.set("certificates", Certificates);
 	            return ReturnObject(Answer);
 	        }
-            if(GetBoolParameter("extraConfiguration")) {
-                Poco::JSON::Object  Answer;
-                MicroService::instance().GetExtraConfiguration(Answer);
-                return ReturnObject(Answer);
-            }
 	        BadRequest(RESTAPI::Errors::InvalidCommand);
 	    }
 
@@ -4887,8 +4815,8 @@ namespace OpenWifi {
 		[[nodiscard]] bool SendToUser(const std::string &userName, const std::string &Payload);
 		void SendToAll(const std::string &Payload);
     private:
-        mutable std::atomic_bool Running_ = false;
-        Poco::Thread 								Thr_;
+        std::atomic_bool Running_ = false;
+        Poco::Thread Thr_;
         // std::unique_ptr<MyParallelSocketReactor> ReactorPool_;
 		Poco::Net::SocketReactor					Reactor_;
 		Poco::Thread								ReactorThread_;
@@ -4978,13 +4906,12 @@ namespace OpenWifi {
 
     [[nodiscard]] inline bool SendToUser(const std::string &userName, const std::string &Payload);
     inline WebSocketClientServer::WebSocketClientServer() noexcept:
-            SubSystemServer("WebSocketClientServer", "UI-WSCLNT-SVR", "websocketclients")
+            SubSystemServer("WebSocketClientServer", "WSCLNT-SVR", "websocketclients")
     {
     }
 
     inline void WebSocketClientServer::run() {
         Running_ = true ;
-		Utils::SetThreadName("ws:uiclnt-svr");
         while(Running_) {
             Poco::Thread::trySleep(2000);
 
@@ -5032,12 +4959,8 @@ namespace OpenWifi {
 
         for(const auto &client:Clients_) {
             if(client.second.second == UserName) {
-				try {
-					if (client.second.first->Send(Payload))
-						Sent++;
-				} catch (...) {
-					return false;
-				}
+                if(client.second.first->Send(Payload))
+                    Sent++;
             }
         }
         return Sent>0;
@@ -5059,70 +4982,70 @@ namespace OpenWifi {
         int flags;
         int n;
         bool Done=false;
-		try {
-			Poco::Buffer<char> IncomingFrame(0);
-			n = WS_->receiveFrame(IncomingFrame, flags);
-			auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
+        Poco::Buffer<char>			IncomingFrame(0);
+        n = WS_->receiveFrame(IncomingFrame, flags);
+        auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
 
-			if (n == 0) {
-				return delete this;
-			}
+        if(n==0) {
+            return delete this;
+        }
 
-			switch (Op) {
-			case Poco::Net::WebSocket::FRAME_OP_PING: {
-				WS_->sendFrame("", 0,
-							   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-								   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_PONG: {
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-				Logger().warning(Poco::format("CLOSE(%s): UI Client is closing its connection.", Id_));
-				Done = true;
-			} break;
-			case Poco::Net::WebSocket::FRAME_OP_TEXT: {
-				IncomingFrame.append(0);
-				if (!Authenticated_) {
-					std::string Frame{IncomingFrame.begin()};
-					auto Tokens = Utils::Split(Frame, ':');
-					bool Expired = false, Contacted = false;
-					if (Tokens.size() == 2 &&
-						AuthClient()->IsAuthorized(Tokens[1], UserInfo_, Expired, Contacted)) {
-						Authenticated_ = true;
-						std::string S{"Welcome! Bienvenue! Bienvenidos!"};
-						WS_->sendFrame(S.c_str(), S.size());
-						WebSocketClientServer()->SetUser(Id_, UserInfo_.userinfo.email);
-					} else {
-						std::string S{"Invalid token. Closing connection."};
-						WS_->sendFrame(S.c_str(), S.size());
-						Done = true;
-					}
+        switch(Op) {
+            case Poco::Net::WebSocket::FRAME_OP_PING: {
+                WS_->sendFrame("", 0,
+                               (int)Poco::Net::WebSocket::FRAME_OP_PONG |
+                               (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_PONG: {
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
+                Logger().warning(Poco::format("CLOSE(%s): Client is closing its connection.",Id_));
+                Done=true;
+            }
+                break;
+            case Poco::Net::WebSocket::FRAME_OP_TEXT: {
+                IncomingFrame.append(0);
+                if(!Authenticated_) {
+                    std::string Frame{IncomingFrame.begin()};
+                    auto Tokens = Utils::Split(Frame,':');
+                    bool Expired = false, Contacted = false;
+                    if(Tokens.size()==2 && AuthClient()->IsAuthorized(Tokens[1], UserInfo_, Expired, Contacted)) {
+                        Authenticated_=true;
+                        std::string S{"Welcome! Bienvenue! Bienvenidos!"};
+                        WS_->sendFrame(S.c_str(),S.size());
+                        WebSocketClientServer()->SetUser(Id_,UserInfo_.userinfo.email);
+                    } else {
+                        std::string S{"Invalid token. Closing connection."};
+                        WS_->sendFrame(S.c_str(),S.size());
+                        Done=true;
+                    }
 
-				} else {
-					try {
-						Poco::JSON::Parser P;
-						auto Obj =
-							P.parse(IncomingFrame.begin()).extract<Poco::JSON::Object::Ptr>();
-						std::string Answer;
-						if (Processor_ != nullptr)
-							Processor_->Processor(Obj, Answer, Done);
-						if (!Answer.empty())
-							WS_->sendFrame(Answer.c_str(), (int)Answer.size());
-						else {
-							WS_->sendFrame("{}", 2);
-						}
-					} catch (const Poco::JSON::JSONException &E) {
-						Logger().log(E);
-						Done=true;
-					}
-				}
-			} break;
-			default: {
-			}
-			}
-		} catch (...) {
-			Done=true;
-		}
+                } else {
+                    try {
+                        Poco::JSON::Parser P;
+                        auto Obj = P.parse(IncomingFrame.begin())
+                                .extract<Poco::JSON::Object::Ptr>();
+                        std::string Answer;
+                        if(Processor_!= nullptr)
+                            Processor_->Processor(Obj, Answer, Done);
+                        if (!Answer.empty())
+                            WS_->sendFrame(Answer.c_str(), (int) Answer.size());
+                        else {
+                            WS_->sendFrame("{}", 2);
+                        }
+                    } catch (const Poco::JSON::JSONException & E) {
+                        Logger().log(E);
+                    }
+                }
+            }
+                break;
+            default:
+            {
+
+            }
+        }
 
         if(Done) {
             delete this;
@@ -5216,7 +5139,7 @@ namespace OpenWifi {
                 try
                 {
                     Poco::Net::WebSocket WS(*Request, *Response);
-                    Logger().information("UI-WebSocket connection established.");
+                    Logger().information("WebSocket connection established.");
                     auto Id = MicroService::CreateUUID();
                     WebSocketClientServer()->NewClient(WS,Id);
                 }

src/framework/orm.h

@@ -133,37 +133,6 @@ namespace ORM {
         return R;
     }
 
-    inline std::string WHERE_AND_(std::string Result) {
-        return Result;
-    }
-
-    template <typename T, typename... Args> std::string WHERE_AND_(std::string Result, const char *fieldName, const T &Value, Args... args) {
-        if constexpr(std::is_same_v<T,std::string>)
-        {
-            if(!Value.empty()) {
-                if(!Result.empty())
-                    Result += " and ";
-                Result += fieldName;
-                Result += '=';
-                Result += "'";
-                Result += Escape(Value);
-                Result += "'";
-            }
-        } else {
-            if(!Result.empty())
-                Result += " and ";
-            Result += fieldName ;
-            Result += '=';
-            Result += std::to_string(Value);
-        }
-        return WHERE_AND_(Result,args...);
-    }
-
-    template <typename... Args> std::string WHERE_AND(Args... args) {
-        std::string Result;
-        return WHERE_AND_(Result, args...);
-    }
-
     enum SqlComparison { EQ = 0, NEQ, LT, LTE, GT, GTE };
     enum SqlBinaryOp { AND = 0 , OR };