From be893a0b08ea64e7fe7f0dfa26c8a7abb7aa4b22 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 29 May 2023 08:31:05 -0700 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-12525 Signed-off-by: stephb9959 --- src/OWLS_EstablishConnection.cpp | 2 +- src/OWLS_HealthCheck.cpp | 2 +- src/OWLS_KeepAlive.cpp | 2 +- src/OWLS_Log.cpp | 2 +- src/OWLS_PendingConfig.cpp | 2 +- src/OWLS_State.cpp | 2 +- src/OWLSclient.cpp | 23 +++++++++++------------ src/OWLSclient.h | 6 +++--- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/OWLS_EstablishConnection.cpp b/src/OWLS_EstablishConnection.cpp index f8b6273..d8a5110 100644 --- a/src/OWLS_EstablishConnection.cpp +++ b/src/OWLS_EstablishConnection.cpp @@ -123,7 +123,7 @@ namespace OpenWifi::OWLSClientEvents { OWLSutils::MakeHeader(ConnectMessage,"connect",Params); - if (Client->SendObject(ConnectMessage)) { + if (Client->SendObject(__func__, ConnectMessage)) { Client->Reset(); Runner->Scheduler().in(std::chrono::seconds(Client->StatisticsInterval_), OWLSClientEvents::State, Client, Runner); diff --git a/src/OWLS_HealthCheck.cpp b/src/OWLS_HealthCheck.cpp index 5e41001..c29bad9 100644 --- a/src/OWLS_HealthCheck.cpp +++ b/src/OWLS_HealthCheck.cpp @@ -29,7 +29,7 @@ namespace OpenWifi::OWLSClientEvents { Params->set(uCentralProtocol::DATA, Data); OWLSutils::MakeHeader(Message, uCentralProtocol::HEALTHCHECK, Params); - if (Client->SendObject(Message)) { + if (Client->SendObject(__func__, Message)) { Runner->Scheduler().in(std::chrono::seconds(Client->HealthInterval_), OWLSClientEvents::HealthCheck, Client, Runner); return; diff --git a/src/OWLS_KeepAlive.cpp b/src/OWLS_KeepAlive.cpp index a3c8c06..42ded2b 100644 --- a/src/OWLS_KeepAlive.cpp +++ b/src/OWLS_KeepAlive.cpp @@ -25,7 +25,7 @@ namespace OpenWifi::OWLSClientEvents { Params->set("uuid", Client->UUID_); OWLSutils::MakeHeader(Message,"ping",Params); - if (Client->SendObject(Message)) { + if (Client->SendObject(__func__, Message)) { Runner->Scheduler().in(std::chrono::seconds(Runner->Details().keepAlive), OWLSClientEvents::KeepAlive, Client, Runner); return; diff --git a/src/OWLS_Log.cpp b/src/OWLS_Log.cpp index d52a1f0..321e791 100644 --- a/src/OWLS_Log.cpp +++ b/src/OWLS_Log.cpp @@ -26,7 +26,7 @@ namespace OpenWifi::OWLSClientEvents { Params->set("log", LogLine); OWLSutils::MakeHeader(Message,"log",Params); - if (Client->SendObject(Message)) { + if (Client->SendObject(__func__,Message)) { return; } } catch (const Poco::Exception &E) { diff --git a/src/OWLS_PendingConfig.cpp b/src/OWLS_PendingConfig.cpp index 7dfbda8..2a26ec0 100644 --- a/src/OWLS_PendingConfig.cpp +++ b/src/OWLS_PendingConfig.cpp @@ -25,7 +25,7 @@ namespace OpenWifi::OWLSClientEvents { Params->set("active", Client->Active_); OWLSutils::MakeHeader(Message,"cfgpending",Params); - if (Client->SendObject(Message)) { + if (Client->SendObject(__func__,Message)) { return; } } catch (const Poco::Exception &E) { diff --git a/src/OWLS_State.cpp b/src/OWLS_State.cpp index a69e3cc..9ef802e 100644 --- a/src/OWLS_State.cpp +++ b/src/OWLS_State.cpp @@ -43,7 +43,7 @@ namespace OpenWifi::OWLSClientEvents { OWLSutils::MakeHeader(Message,uCentralProtocol::STATE,Params); - if (Client->SendObject(Message)) { + if (Client->SendObject(__func__, Message)) { Runner->Scheduler().in(std::chrono::seconds(Client->StatisticsInterval_), OWLSClientEvents::State, Client, Runner); return; diff --git a/src/OWLSclient.cpp b/src/OWLSclient.cpp index 9bb34b6..a63ffec 100644 --- a/src/OWLSclient.cpp +++ b/src/OWLSclient.cpp @@ -402,7 +402,7 @@ namespace OpenWifi { OWLSutils::MakeRPCHeader(Answer, Id, Result); poco_information(Client->Logger_,fmt::format("configure({}): done.", Client->SerialNumber_)); // std::this_thread::sleep_for(std::chrono::seconds(OWLSutils::local_random(10,30))); - Client->SendObject(Answer); + Client->SendObject(__func__,Answer); } else { poco_warning(Client->Logger_,fmt::format("configure({}): Illegal command.", Client->SerialNumber_)); } @@ -460,7 +460,7 @@ namespace OpenWifi { OWLSutils::MakeRPCHeader(Answer,Id,Result); poco_information(Client->Logger_,fmt::format("reboot({}): done.", Client->SerialNumber_)); - Client->SendObject(Answer); + Client->SendObject(__func__ ,Answer); Client->Disconnect(ClientGuard); Client->Reset(); std::this_thread::sleep_for(std::chrono::seconds(20)); @@ -506,7 +506,7 @@ namespace OpenWifi { Result->set(uCentralProtocol::STATUS, Status); OWLSutils::MakeRPCHeader(Answer, Id, Result); poco_information(Client->Logger_,fmt::format("upgrade({}): from URI={}.", Client->SerialNumber_, URI)); - Client->SendObject(Answer); + Client->SendObject(__func__ , Answer); Client->Disconnect(ClientGuard); Client->Version_++; Client->SetFirmware(GetFirmware(URI)); @@ -539,7 +539,7 @@ namespace OpenWifi { Result->set(uCentralProtocol::STATUS, Status); OWLSutils::MakeRPCHeader(Answer, Id, Result); poco_information(Client->Logger_, fmt::format("factory({}): done.", Client->SerialNumber_)); - Client->SendObject(Answer); + Client->SendObject(__func__ , Answer); Client->Disconnect(ClientGuard); Client->CurrentConfig_ = SimulationCoordinator()->GetSimConfigurationPtr(Utils::Now()); Client->UpdateConfiguration(); @@ -572,7 +572,7 @@ namespace OpenWifi { OWLSutils::MakeRPCHeader(Answer, Id, Result); poco_information(Client->Logger_,fmt::format("LEDs({}): pattern set to: {} for {} ms.", Client->SerialNumber_, Duration, Pattern)); - Client->SendObject(Answer); + Client->SendObject(__func__ , Answer); } else { Client->Logger_.warning(fmt::format("LEDs({}): Illegal command.", Client->SerialNumber_)); } @@ -593,7 +593,7 @@ namespace OpenWifi { OWLSutils::MakeRPCHeader(Answer, Id, Result); poco_information(Logger_,fmt::format("UNSUPPORTED({}): command {} not allowed for simulated devices.", SerialNumber_, Method)); - SendObject(Answer); + SendObject(__func__, Answer); } catch(const Poco::Exception &E) { } @@ -643,24 +643,23 @@ namespace OpenWifi { } */ - bool OWLSclient::SendObject(const Poco::JSON::Object::Ptr &O) { + bool OWLSclient::SendObject(const char *context, const Poco::JSON::Object::Ptr &O) { if(!Runner_->Running()) { return false; } + std::ostringstream os; try { - std::ostringstream os; O->stringify(os); uint32_t BytesSent = WS_->sendFrame(os.str().c_str(), os.str().size()); if (BytesSent == os.str().size()) { SimStats()->AddOutMsg(Runner_->Id(),BytesSent); return true; } else { - DEBUG_LINE("failed"); - Logger_.warning( - fmt::format("SEND({}): incomplete send. Sent: {}", SerialNumber_, BytesSent)); + std::cout << fmt::format("SendObject({},{}): size={} sent={}", context, SerialNumber_, os.str().size(), BytesSent) << std::endl; + Logger_.warning(fmt::format("SendObject({},{}): size={} sent={}", context, SerialNumber_, os.str().size(), BytesSent)); } } catch (const Poco::Exception &E) { - std::cout << __LINE__ << ": " << E.displayText() << " | " << E.message() << std::endl; + std::cout << fmt::format("SendObject({},{}): size={} exception={}", context, SerialNumber_, os.str().size(), E.displayText()) << std::endl; Logger_.log(E); } catch (const std::exception &E) { DEBUG_LINE("exception2"); diff --git a/src/OWLSclient.h b/src/OWLSclient.h index 55a1fb1..ce5c2ce 100644 --- a/src/OWLSclient.h +++ b/src/OWLSclient.h @@ -37,9 +37,9 @@ namespace OpenWifi { poco_debug(Logger_,fmt::format("{} simulator client done.", SerialNumber_)); } - bool Send(const std::string &Cmd); - bool SendWSPing(); - bool SendObject(const Poco::JSON::Object::Ptr &O); +// bool Send(const std::string &Cmd); +// bool SendWSPing(); + bool SendObject(const char *context, const Poco::JSON::Object::Ptr &O); void SetFirmware(const std::string &S = "sim-firmware-1") { Firmware_ = S; } [[nodiscard]] const std::string &Serial() const { return SerialNumber_; }