Code changes after analyzer

This commit is contained in:
stephb9959
2022-03-25 10:12:31 -07:00
parent fe3eeb3765
commit 1af0df90d4
3 changed files with 9 additions and 7 deletions

View File

@@ -39,10 +39,8 @@ namespace OpenWifi {
return instance_;
}
void Daemon::initialize([[maybe_unused]] Poco::Util::Application &self) {
void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
std::cout << "Daemon initializing" << std::endl;
// MicroService::instance().initialize(self);
std::cout << "Daemon done" << std::endl;
}
}

View File

@@ -37,7 +37,7 @@ namespace OpenWifi {
const SubSystemVec & SubSystems) :
MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
void initialize(Poco::Util::Application &self);
void PostInitialization(Poco::Util::Application &self);
static Daemon *instance();
inline OpenWifi::AnalyticsDashboard & GetDashboard() { return DB_; }
Poco::Logger & Log() { return Poco::Logger::get(AppName()); }
@@ -47,5 +47,8 @@ namespace OpenWifi {
};
inline Daemon * Daemon() { return Daemon::instance(); }
inline void DaemonPostInitialization(Poco::Util::Application &self) {
Daemon()->PostInitialization(self);
}
}

View File

@@ -80,9 +80,7 @@ using namespace std::chrono_literals;
#include "framework/ow_constants.h"
#include "RESTObjects/RESTAPI_SecurityObjects.h"
#include "nlohmann/json.hpp"
#include "ow_version.h"
#include "fmt/core.h"
#define _OWDEBUG_ std::cout<< __FILE__ <<":" << __LINE__ << std::endl;
@@ -3417,6 +3415,8 @@ namespace OpenWifi {
}
}
void DaemonPostInitialization(Poco::Util::Application &self);
inline void MicroService::initialize(Poco::Util::Application &self) {
// add the default services
std::cout << "Initialize MicroService" << std::endl;
@@ -3450,7 +3450,8 @@ namespace OpenWifi {
LoadMyConfig();
InitializeSubSystemServers();
// ServerApplication::initialize(self);
ServerApplication::initialize(self);
DaemonPostInitialization(self);
Types::TopicNotifyFunction F = [this](const std::string &Key,const std::string &Payload) { this->BusMessageReceived(Key, Payload); };
KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);