From 54a5c4f2766927427431fd9960c7936dccadeaba Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 23 Jul 2021 08:14:34 +0300 Subject: EventPipeRun -> EvenPipeActive Signed-off-by: Valery Piashchynski --- plugins/jobs/drivers/amqp/consumer.go | 2 +- plugins/jobs/drivers/ephemeral/consumer.go | 2 +- plugins/jobs/drivers/sqs/consumer.go | 2 +- plugins/jobs/plugin.go | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/jobs/drivers/amqp/consumer.go b/plugins/jobs/drivers/amqp/consumer.go index f6442b42..32119273 100644 --- a/plugins/jobs/drivers/amqp/consumer.go +++ b/plugins/jobs/drivers/amqp/consumer.go @@ -344,7 +344,7 @@ func (j *JobsConsumer) Run(p *pipeline.Pipeline) error { j.listener(deliv) j.eh.Push(events.JobEvent{ - Event: events.EventPipeRun, + Event: events.EventPipeActive, Driver: pipe.Driver(), Pipeline: pipe.Name(), Start: time.Now(), diff --git a/plugins/jobs/drivers/ephemeral/consumer.go b/plugins/jobs/drivers/ephemeral/consumer.go index 71652066..ff8f7860 100644 --- a/plugins/jobs/drivers/ephemeral/consumer.go +++ b/plugins/jobs/drivers/ephemeral/consumer.go @@ -185,7 +185,7 @@ func (j *JobBroker) Resume(pipeline string) { // Run is no-op for the ephemeral func (j *JobBroker) Run(pipe *pipeline.Pipeline) error { j.eh.Push(events.JobEvent{ - Event: events.EventPipeRun, + Event: events.EventPipeActive, Driver: pipe.Driver(), Pipeline: pipe.Name(), Start: time.Now(), diff --git a/plugins/jobs/drivers/sqs/consumer.go b/plugins/jobs/drivers/sqs/consumer.go index 246ff3ba..1ded5bc9 100644 --- a/plugins/jobs/drivers/sqs/consumer.go +++ b/plugins/jobs/drivers/sqs/consumer.go @@ -297,7 +297,7 @@ func (j *JobConsumer) Run(p *pipeline.Pipeline) error { go j.listen() j.eh.Push(events.JobEvent{ - Event: events.EventPipeRun, + Event: events.EventPipeActive, Driver: pipe.Driver(), Pipeline: pipe.Name(), Start: time.Now(), diff --git a/plugins/jobs/plugin.go b/plugins/jobs/plugin.go index e118f732..5779b368 100644 --- a/plugins/jobs/plugin.go +++ b/plugins/jobs/plugin.go @@ -523,8 +523,6 @@ func (p *Plugin) collectJobsEvents(event interface{}) { p.log.Error("job push error", "error", jev.Error, "pipeline", jev.Pipeline, "ID", jev.ID, "Driver", jev.Driver, "start", jev.Start.UTC(), "elapsed", jev.Elapsed) case events.EventJobError: p.log.Error("job error", "error", jev.Error, "pipeline", jev.Pipeline, "ID", jev.ID, "Driver", jev.Driver, "start", jev.Start.UTC(), "elapsed", jev.Elapsed) - case events.EventPipeRun: - p.log.Info("pipeline started", "pipeline", jev.Pipeline, "start", jev.Start.UTC(), "elapsed", jev.Elapsed) case events.EventPipeActive: p.log.Info("pipeline active", "pipeline", jev.Pipeline, "start", jev.Start.UTC(), "elapsed", jev.Elapsed) case events.EventPipeStopped: -- cgit v1.2.3