Add headers support to the jobs protocol

Signed-off-by: Valery Piashchynski <[email protected]>

2 files changed, 7 insertions, 50 deletions

diff --git a/plugins/jobs/job/general.go b/plugins/jobs/job/general.go
index d2a27373..0a75f2e6 100644
--- a/plugins/jobs/job/general.go
+++ b/plugins/jobs/job/general.go
@@ -2,14 +2,13 @@ package job
 
 // constant keys to pack/unpack messages from different drivers
 const (
-	RRID          string = "rr_id"
-	RRJob         string = "rr_job"
-	RRHeaders     string = "rr_headers"
-	RRPipeline    string = "rr_pipeline"
-	RRTimeout     string = "rr_timeout"
-	RRDelay       string = "rr_delay"
-	RRPriority    string = "rr_priority"
-	RRMaxAttempts string = "rr_max_attempts"
+	RRID       string = "rr_id"
+	RRJob      string = "rr_job"
+	RRHeaders  string = "rr_headers"
+	RRPipeline string = "rr_pipeline"
+	RRTimeout  string = "rr_timeout"
+	RRDelay    string = "rr_delay"
+	RRPriority string = "rr_priority"
 )
 
 // Job carries information about single job.
@@ -29,31 +28,3 @@ type Job struct {
 	// Options contains set of PipelineOptions specific to job execution. Can be empty.
 	Options *Options `json:"options,omitempty"`
 }
-
-func (j Job) ID() string {
-	panic("implement me")
-}
-
-func (j Job) Priority() int64 {
-	panic("implement me")
-}
-
-func (j Job) Body() []byte {
-	panic("implement me")
-}
-
-func (j Job) Context() ([]byte, error) {
-	panic("implement me")
-}
-
-func (j Job) Ack() error {
-	panic("implement me")
-}
-
-func (j Job) Nack() error {
-	panic("implement me")
-}
-
-func (j Job) Requeue(delay uint32) error {
-	panic("implement me")
-}
diff --git a/plugins/jobs/job/job_options.go b/plugins/jobs/job/job_options.go
index af971d15..133ae1a8 100644
--- a/plugins/jobs/job/job_options.go
+++ b/plugins/jobs/job/job_options.go
@@ -14,10 +14,6 @@ type Options struct {
 	// Delay defines time duration to delay execution for. Defaults to none.
 	Delay int64 `json:"delay,omitempty"`
 
-	// Attempts define maximum job retries. Attention, value 1 will only allow job to execute once (without retry).
-	// Minimum valuable value is 2.
-	Attempts int64 `json:"maxAttempts,omitempty"`
-
 	// RetryDelay defines for how long job should be waiting until next retry. Defaults to none.
 	RetryDelay int64 `json:"retryDelay,omitempty"`
 
@@ -31,10 +27,6 @@ func (o *Options) Merge(from *Options) {
 		o.Pipeline = from.Pipeline
 	}
 
-	if o.Attempts == 0 {
-		o.Attempts = from.Attempts
-	}
-
 	if o.Timeout == 0 {
 		o.Timeout = from.Timeout
 	}
@@ -48,12 +40,6 @@ func (o *Options) Merge(from *Options) {
 	}
 }
 
-// CanRetry must return true if broker is allowed to re-run the job.
-func (o *Options) CanRetry(attempt int64) bool {
-	// Attempts 1 and 0 has identical effect
-	return o.Attempts > (attempt + 1)
-}
-
 // RetryDuration returns retry delay duration in a form of time.Duration.
 func (o *Options) RetryDuration() time.Duration {
 	return time.Second * time.Duration(o.RetryDelay)