scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-03 03:57:55 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix: https://telecominfraproject.atlassian.net/browse/WIFI-10070

Browse Source 
Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
This commit is contained in:
stephb9959
2022-07-07 10:23:01 -07:00
parent cf441de197
commit f9f4624add
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/JobController.cpp
View File

@@ -37,6 +37,7 @@ namespace OpenWifi {
if(job!=nullptr) { if(job!=nullptr) {
if(job->Started()==0 && Pool_.used()<Pool_.available()) { if(job->Started()==0 && Pool_.used()<Pool_.available()) {
std::cout << "Starting: " << job->Name() << " ID:" << job->JobId() << std::endl; std::cout << "Starting: " << job->Name() << " ID:" << job->JobId() << std::endl;
job->Logger().information(fmt::format("Starting {}: {}",job->JobId(),job->Name());
job->Start(); job->Start();
Pool_.start(*job); Pool_.start(*job);
} }
@@ -47,6 +48,7 @@ namespace OpenWifi {
if(*it!=nullptr && (*it)->Completed()!=0) { if(*it!=nullptr && (*it)->Completed()!=0) {
auto tmp = it; auto tmp = it;
it = jobs_.erase(it); it = jobs_.erase(it);
std::cout << "Completed: " << (*it)->Name() << " ID:" << (*it)->JobId() << std::endl;
delete *tmp; delete *tmp;
} else { } else {
++it; ++it;

4
src/RESTAPI/RESTAPI_venue_handler.cpp
View File

@@ -231,7 +231,11 @@ namespace OpenWifi{
auto JobId = MicroService::instance().CreateUUID(); auto JobId = MicroService::instance().CreateUUID();
Types::StringVec Parameters{UUID};; Types::StringVec Parameters{UUID};;
auto NewJob = new VenueConfigUpdater(JobId,"VenueConfigurationUpdater", Parameters, 0, UserInfo_.userinfo, Logger()); auto NewJob = new VenueConfigUpdater(JobId,"VenueConfigurationUpdater", Parameters, 0, UserInfo_.userinfo, Logger());
std::cout << "Adding new job" << std::endl;
JobController()->AddJob(dynamic_cast<Job*>(NewJob)); JobController()->AddJob(dynamic_cast<Job*>(NewJob));
std::cout << "Job added" << std::endl;
SNL.to_json(Answer); SNL.to_json(Answer);
Answer.set("jobId",JobId); Answer.set("jobId",JobId);
return ReturnObject(Answer); return ReturnObject(Answer);