From d62acca114a9646afed6ec0217b8cb709687aeb9 Mon Sep 17 00:00:00 2001
From: Valery Piashchynski <piashchynski.valery@gmail.com>
Date: Wed, 1 Sep 2021 16:50:41 +0300
Subject: Close connection in the amqp driver. bytes.Buffer update in the
 beanstalk driver

Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
---
 plugins/jobs/job/job.go      | 11 -----------
 plugins/jobs/job/job_test.go | 27 ---------------------------
 2 files changed, 38 deletions(-)

(limited to 'plugins/jobs/job')

diff --git a/plugins/jobs/job/job.go b/plugins/jobs/job/job.go
index 06c3254e..adab2a0a 100644
--- a/plugins/jobs/job/job.go
+++ b/plugins/jobs/job/job.go
@@ -45,17 +45,6 @@ type Options struct {
 	Delay int64 `json:"delay,omitempty"`
 }
 
-// Merge merges job options.
-func (o *Options) Merge(from *Options) {
-	if o.Pipeline == "" {
-		o.Pipeline = from.Pipeline
-	}
-
-	if o.Delay == 0 {
-		o.Delay = from.Delay
-	}
-}
-
 // DelayDuration returns delay duration in a form of time.Duration.
 func (o *Options) DelayDuration() time.Duration {
 	return time.Second * time.Duration(o.Delay)
diff --git a/plugins/jobs/job/job_test.go b/plugins/jobs/job/job_test.go
index a47151a3..4a95e27d 100644
--- a/plugins/jobs/job/job_test.go
+++ b/plugins/jobs/job/job_test.go
@@ -16,30 +16,3 @@ func TestOptions_DelayDuration2(t *testing.T) {
 	opts := &Options{Delay: 1}
 	assert.Equal(t, time.Second, opts.DelayDuration())
 }
-
-func TestOptions_Merge(t *testing.T) {
-	opts := &Options{}
-
-	opts.Merge(&Options{
-		Pipeline: "pipeline",
-		Delay:    2,
-	})
-
-	assert.Equal(t, "pipeline", opts.Pipeline)
-	assert.Equal(t, int64(2), opts.Delay)
-}
-
-func TestOptions_MergeKeepOriginal(t *testing.T) {
-	opts := &Options{
-		Pipeline: "default",
-		Delay:    10,
-	}
-
-	opts.Merge(&Options{
-		Pipeline: "pipeline",
-		Delay:    2,
-	})
-
-	assert.Equal(t, "default", opts.Pipeline)
-	assert.Equal(t, int64(10), opts.Delay)
-}
-- 
cgit v1.2.3