diff --git a/build b/build index e3f1e9b..c147342 100644 --- a/build +++ b/build @@ -1 +1 @@ -80 \ No newline at end of file +81 \ No newline at end of file diff --git a/src/RESTAPI/RESTAPI_inventory_handler.cpp b/src/RESTAPI/RESTAPI_inventory_handler.cpp index 9ddfd65..1bbb2bd 100644 --- a/src/RESTAPI/RESTAPI_inventory_handler.cpp +++ b/src/RESTAPI/RESTAPI_inventory_handler.cpp @@ -17,8 +17,6 @@ #include "SerialNumberCache.h" #include "DeviceTypeCache.h" -#define __DBG__ std::cout << __LINE__ << std::endl; - namespace OpenWifi{ void GetRejectedLines(const Poco::JSON::Object::Ptr &Response, Types::StringVec & Warnings) { @@ -38,41 +36,27 @@ namespace OpenWifi{ void RESTAPI_inventory_handler::DoGet() { ProvObjects::InventoryTag Existing; - __DBG__ std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,""); - __DBG__ Logger().debug(Poco::format("%s: Retrieving inventory information.",SerialNumber)); - __DBG__ if(SerialNumber.empty() || !DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER,SerialNumber,Existing)) { return NotFound(); } - __DBG__ Logger().debug(Poco::format("%s,%s: Retrieving inventory information.", Existing.serialNumber, Existing.info.id )); - __DBG__ Poco::JSON::Object Answer; std::string Arg; - __DBG__ if(HasParameter("config",Arg) && Arg=="true") { - __DBG__ bool Explain = (HasParameter("explain",Arg) && Arg == "true"); - __DBG__ APConfig Device(SerialNumber,Existing.deviceType,Logger(), Explain); - __DBG__ auto Configuration = Poco::makeShared(); if(Device.Get(Configuration)) { - __DBG__ Answer.set("config", Configuration); if(Explain) - __DBG__ Answer.set("explanation", Device.Explanation()); } else { - __DBG__ Answer.set("config","none"); - __DBG__ } - __DBG__ return ReturnObject(Answer); } else if(HasParameter("firmwareOptions", Arg) && Arg=="true") { ProvObjects::FIRMWARE_UPGRADE_RULES Rules; @@ -246,9 +230,6 @@ namespace OpenWifi{ InternalError(RESTAPI::Errors::RecordNotCreated); } - -#define __DBG__ std::cout << __LINE__ << std::endl; - void RESTAPI_inventory_handler::DoPut() { std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,""); diff --git a/src/Tasks/VenueConfigUpdater.h b/src/Tasks/VenueConfigUpdater.h index 3ca1af5..8e56d3d 100644 --- a/src/Tasks/VenueConfigUpdater.h +++ b/src/Tasks/VenueConfigUpdater.h @@ -37,7 +37,7 @@ namespace OpenWifi { } - std::string Start() { + inline std::string Start() { JobId_ = MicroService::CreateUUID(); Worker_.start(*this); return JobId_; @@ -53,7 +53,7 @@ namespace OpenWifi { inline Poco::Logger & Logger() { return Logger_; } - void run() final { + inline void run() final { if(When_ && When_>OpenWifi::Now()) Poco::Thread::trySleep( (long) (When_ - OpenWifi::Now()) * 1000 ); @@ -68,7 +68,6 @@ namespace OpenWifi { if(StorageService()->InventoryDB().GetRecord("id",uuid,Device)) { Logger().debug(fmt::format("{}: Computing configuration.",Device.serialNumber)); - std::cout << "Updating device: " << Device.serialNumber << std::endl; auto DeviceConfig = std::make_shared(Device.serialNumber, Device.deviceType, Logger(), false); auto Configuration = Poco::makeShared(); Poco::JSON::Object ErrorsObj, WarningsObj; @@ -81,7 +80,6 @@ namespace OpenWifi { Logger().debug(fmt::format("{}: Sending configuration push.",Device.serialNumber)); if (SDK::GW::Device::Configure(nullptr, Device.serialNumber, Configuration, Response)) { Logger().debug(fmt::format("{}: Sending configuration pushed.",Device.serialNumber)); - std::cout << "Updated: " << Device.serialNumber << std::endl; GetRejectedLines(Response, Results.warnings); Results.errorCode = 0; Logger().information(fmt::format("Device {} updated.", Device.serialNumber));