X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fjobs%2Fjobs.go;h=6dad5fd9769f8da8adca72d5dabbca518ad76c8e;hb=0f6367023720ecc7d7b4b38cbbc4282792172a89;hp=d4694bf23417c07c739c1ec6705dbc50fd2c9965;hpb=c0f4d277bca3ac3f3d7a7a9dfc687580dc6a1f35;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/jobs/jobs.go b/dmaap-mediator-producer/internal/jobs/jobs.go index d4694bf2..6dad5fd9 100644 --- a/dmaap-mediator-producer/internal/jobs/jobs.go +++ b/dmaap-mediator-producer/internal/jobs/jobs.go @@ -52,8 +52,8 @@ type JobTypesManager interface { } type JobsManager interface { - AddJob(JobInfo) error - DeleteJob(jobId string) + AddJobFromRESTCall(JobInfo) error + DeleteJobFromRESTCall(jobId string) } type JobsManagerImpl struct { @@ -74,7 +74,7 @@ func NewJobsManagerImpl(typeConfigFilePath string, pollClient restclient.HTTPCli } } -func (jm *JobsManagerImpl) AddJob(ji JobInfo) error { +func (jm *JobsManagerImpl) AddJobFromRESTCall(ji JobInfo) error { if err := jm.validateJobInfo(ji); err == nil { typeData := jm.allTypes[ji.InfoTypeIdentity] typeData.jobsHandler.addJobCh <- ji @@ -85,7 +85,7 @@ func (jm *JobsManagerImpl) AddJob(ji JobInfo) error { } } -func (jm *JobsManagerImpl) DeleteJob(jobId string) { +func (jm *JobsManagerImpl) DeleteJobFromRESTCall(jobId string) { for _, typeData := range jm.allTypes { log.Debugf("Deleting job %v from type %v", jobId, typeData.TypeId) typeData.jobsHandler.deleteJobCh <- jobId @@ -137,10 +137,10 @@ func (jm *JobsManagerImpl) GetSupportedTypes() []string { return supportedTypes } -func (jm *JobsManagerImpl) StartJobs() { +func (jm *JobsManagerImpl) StartJobsForAllTypes() { for _, jobType := range jm.allTypes { - go jobType.jobsHandler.start(jm.mrAddress) + go jobType.jobsHandler.startPollingAndDistribution(jm.mrAddress) } } @@ -168,7 +168,7 @@ func newJobsHandler(typeId string, topicURL string, pollClient restclient.HTTPCl } } -func (jh *jobsHandler) start(mRAddress string) { +func (jh *jobsHandler) startPollingAndDistribution(mRAddress string) { go func() { for { jh.pollAndDistributeMessages(mRAddress)