scottk/wlan-cloud-ucentralsec
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralsec.git synced 2025-10-29 09:52:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

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

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2023-12-03 13:23:20 -08:00
parent db45a01bce
commit 5b3205823e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/framework/MicroService.cpp
View File

@@ -47,6 +47,9 @@ namespace OpenWifi {
void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key, void MicroService::BusMessageReceived([[maybe_unused]] const std::string &Key,
const std::string &Payload) { const std::string &Payload) {
std::lock_guard G(InfraMutex_); std::lock_guard G(InfraMutex_);
Poco::Logger &BusLogger = Poco::Logger::create(
"BusMessageReceived", Poco::Logger::root().getChannel(), Poco::Logger::root().getLevel());
try { try {
Poco::JSON::Parser P; Poco::JSON::Parser P;
auto Object = P.parse(Payload).extract<Poco::JSON::Object::Ptr>(); auto Object = P.parse(Payload).extract<Poco::JSON::Object::Ptr>();
@@ -69,7 +72,7 @@ namespace OpenWifi {
if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) { if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
Services_.erase(PrivateEndPoint); Services_.erase(PrivateEndPoint);
poco_information( poco_information(
Logger_, BusLogger,
fmt::format( fmt::format(
"Service {} ID={} leaving system.", "Service {} ID={} leaving system.",
Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE) Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
@@ -99,7 +102,7 @@ namespace OpenWifi {
Services_[PrivateEndPoint] = ServiceInfo; Services_[PrivateEndPoint] = ServiceInfo;
if(Event == KafkaTopics::ServiceEvents::EVENT_JOIN) { if(Event == KafkaTopics::ServiceEvents::EVENT_JOIN) {
poco_information( poco_information(
Logger_, BusLogger,
fmt::format( fmt::format(
"Service {} ID={} is joining the system. old={}", "Service {} ID={} is joining the system. old={}",
Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE) Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE)
@@ -113,13 +116,13 @@ namespace OpenWifi {
SvcList += ", " + Svc.second.Type; SvcList += ", " + Svc.second.Type;
} }
poco_information( poco_information(
Logger_, BusLogger,
fmt::format("Current list of microservices: {}", SvcList)); fmt::format("Current list of microservices: {}", SvcList));
} }
} }
} else { } else {
poco_information( poco_information(
Logger_, BusLogger,
fmt::format("KAFKA-MSG: invalid event '{}', missing a field.", fmt::format("KAFKA-MSG: invalid event '{}', missing a field.",
Event)); Event));
} }
@@ -131,18 +134,18 @@ namespace OpenWifi {
#endif #endif
} else { } else {
poco_information( poco_information(
Logger_, BusLogger,
fmt::format("KAFKA-MSG: invalid event '{}', missing token", Event)); fmt::format("KAFKA-MSG: invalid event '{}', missing token", Event));
} }
} else { } else {
poco_information(Logger_, poco_information(BusLogger,
fmt::format("Unknown Event: {} Source: {}", Event, ID)); fmt::format("Unknown Event: {} Source: {}", Event, ID));
} }
} }
} else { } else {
std::ostringstream os; std::ostringstream os;
Object->stringify(std::cout); Object->stringify(std::cout);
poco_error(Logger_, fmt::format("Bad bus message: {}", os.str())); poco_error(BusLogger, fmt::format("Bad bus message: {}", os.str()));
} }
auto ServiceHint = Services_.begin(); auto ServiceHint = Services_.begin();
@@ -151,18 +154,18 @@ namespace OpenWifi {
auto ss1 = MakeServiceListString(Services_); auto ss1 = MakeServiceListString(Services_);
while(ServiceHint!=Services_.end()) { while(ServiceHint!=Services_.end()) {
if ((now - ServiceHint->second.LastUpdate) > 120) { if ((now - ServiceHint->second.LastUpdate) > 120) {
poco_information(Logger_, fmt::format("ZombieService: Removing service {}, ", ServiceHint->second.PublicEndPoint)); poco_information(BusLogger, fmt::format("ZombieService: Removing service {}, ", ServiceHint->second.PublicEndPoint));
ServiceHint = Services_.erase(ServiceHint); ServiceHint = Services_.erase(ServiceHint);
} else } else
++ServiceHint; ++ServiceHint;
} }
if(Services_.size() != si1) { if(Services_.size() != si1) {
auto ss2 = MakeServiceListString(Services_); auto ss2 = MakeServiceListString(Services_);
poco_information(Logger_, fmt::format("Current list of microservices: {} -> {}", ss1, ss2)); poco_information(BusLogger, fmt::format("Current list of microservices: {} -> {}", ss1, ss2));
} }
} catch (const Poco::Exception &E) { } catch (const Poco::Exception &E) {
Logger_.log(E); BusLogger.log(E);
} }
} }