Skip to content

Commit

Permalink
Align job iteration logic
Browse files Browse the repository at this point in the history
  • Loading branch information
crazy-max committed Dec 29, 2022
1 parent 858a958 commit 88426ef
Showing 1 changed file with 28 additions and 25 deletions.
53 changes: 28 additions & 25 deletions internal/app/diun.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,37 @@ func (di *Diun) Run() {
}, ants.WithLogger(new(logging.AntsLogger)))
defer di.pool.Release()

for _, job := range di.providersJobs() {
// Docker provider
for _, job := range dockerPrd.New(di.cfg.Providers.Docker).ListJob() {
di.createJob(job)
}

// Swarm provider
for _, job := range swarmPrd.New(di.cfg.Providers.Swarm).ListJob() {
di.createJob(job)
}

// Kubernetes provider
for _, job := range kubernetesPrd.New(di.cfg.Providers.Kubernetes).ListJob() {
di.createJob(job)
}
di.wg.Wait()

// File provider
for _, job := range filePrd.New(di.cfg.Providers.File).ListJob() {
di.createJob(job)
}

// Dockerfile provider
for _, job := range dockerfilePrd.New(di.cfg.Providers.Dockerfile).ListJob() {
di.createJob(job)
}

// Nomad provider
for _, job := range nomadPrd.New(di.cfg.Providers.Nomad).ListJob() {
di.createJob(job)
}

di.wg.Wait()
log.Info().
Int("added", entries.CountNew).
Int("updated", entries.CountUpdate).
Expand All @@ -176,26 +202,3 @@ func (di *Diun) Close() {
log.Warn().Err(err).Msg("Cannot close database")
}
}

func (di *Diun) providersJobs() []model.Job {
var jobs []model.Job
for _, job := range dockerPrd.New(di.cfg.Providers.Docker).ListJob() {
jobs = append(jobs, job)
}
for _, job := range swarmPrd.New(di.cfg.Providers.Swarm).ListJob() {
jobs = append(jobs, job)
}
for _, job := range kubernetesPrd.New(di.cfg.Providers.Kubernetes).ListJob() {
jobs = append(jobs, job)
}
for _, job := range filePrd.New(di.cfg.Providers.File).ListJob() {
jobs = append(jobs, job)
}
for _, job := range dockerfilePrd.New(di.cfg.Providers.Dockerfile).ListJob() {
jobs = append(jobs, job)
}
for _, job := range nomadPrd.New(di.cfg.Providers.Nomad).ListJob() {
jobs = append(jobs, job)
}
return jobs
}

0 comments on commit 88426ef

Please sign in to comment.