Update modules

rustatian · rustatian · commit 6e187069eca3 · 2020-03-04T14:47:35.000+03:00
diff --git a/v2/broker/amqp/broker.go b/v2/broker/amqp/broker.go
@@ -3,7 +3,7 @@ package amqp
 import (
 	"fmt"
 	"github.com/gofrs/uuid"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"sync"
 	"sync/atomic"
 )
diff --git a/v2/broker/amqp/broker_test.go b/v2/broker/amqp/broker_test.go
@@ -1,7 +1,7 @@
 package amqp
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/amqp/consume_test.go b/v2/broker/amqp/consume_test.go
@@ -2,7 +2,7 @@ package amqp
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/amqp/durability_test.go b/v2/broker/amqp/durability_test.go
@@ -1,7 +1,7 @@
 package amqp
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"net"
diff --git a/v2/broker/amqp/job.go b/v2/broker/amqp/job.go
@@ -2,7 +2,7 @@ package amqp
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/streadway/amqp"
 )
 
diff --git a/v2/broker/amqp/queue.go b/v2/broker/amqp/queue.go
@@ -2,7 +2,7 @@ package amqp
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/streadway/amqp"
 	"os"
 	"sync"
diff --git a/v2/broker/amqp/stat_test.go b/v2/broker/amqp/stat_test.go
@@ -1,7 +1,7 @@
 package amqp
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/v2/broker/beanstalk/broker.go b/v2/broker/beanstalk/broker.go
@@ -2,7 +2,7 @@ package beanstalk
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"sync"
 )
 
diff --git a/v2/broker/beanstalk/broker_test.go b/v2/broker/beanstalk/broker_test.go
@@ -2,7 +2,7 @@ package beanstalk
 
 import (
 	"github.com/beanstalkd/go-beanstalk"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/beanstalk/consume_test.go b/v2/broker/beanstalk/consume_test.go
@@ -2,7 +2,7 @@ package beanstalk
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/beanstalk/durability_test.go b/v2/broker/beanstalk/durability_test.go
@@ -1,7 +1,7 @@
 package beanstalk
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"net"
diff --git a/v2/broker/beanstalk/job.go b/v2/broker/beanstalk/job.go
@@ -3,7 +3,7 @@ package beanstalk
 import (
 	"bytes"
 	"encoding/gob"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 )
 
 func pack(j *jobs.Job) []byte {
diff --git a/v2/broker/beanstalk/stat_test.go b/v2/broker/beanstalk/stat_test.go
@@ -1,7 +1,7 @@
 package beanstalk
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/beanstalk/tube.go b/v2/broker/beanstalk/tube.go
@@ -3,7 +3,7 @@ package beanstalk
 import (
 	"fmt"
 	"github.com/beanstalkd/go-beanstalk"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"strconv"
 	"sync"
 	"sync/atomic"
diff --git a/v2/broker/ephemeral/broker.go b/v2/broker/ephemeral/broker.go
@@ -3,7 +3,7 @@ package ephemeral
 import (
 	"fmt"
 	"github.com/gofrs/uuid"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"sync"
 )
 
diff --git a/v2/broker/ephemeral/broker_test.go b/v2/broker/ephemeral/broker_test.go
@@ -1,7 +1,7 @@
 package ephemeral
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/ephemeral/consume_test.go b/v2/broker/ephemeral/consume_test.go
@@ -2,7 +2,7 @@ package ephemeral
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/ephemeral/queue.go b/v2/broker/ephemeral/queue.go
@@ -1,7 +1,7 @@
 package ephemeral
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"sync"
 	"sync/atomic"
 	"time"
diff --git a/v2/broker/ephemeral/stat_test.go b/v2/broker/ephemeral/stat_test.go
@@ -1,7 +1,7 @@
 package ephemeral
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/v2/broker/sqs/broker.go b/v2/broker/sqs/broker.go
@@ -3,7 +3,7 @@ package sqs
 import (
 	"fmt"
 	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"sync"
 )
 
diff --git a/v2/broker/sqs/broker_test.go b/v2/broker/sqs/broker_test.go
@@ -1,7 +1,7 @@
 package sqs
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/sqs/consume_test.go b/v2/broker/sqs/consume_test.go
@@ -2,7 +2,7 @@ package sqs
 
 import (
 	"fmt"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
diff --git a/v2/broker/sqs/durability_test.go b/v2/broker/sqs/durability_test.go
@@ -1,7 +1,7 @@
 package sqs
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"net"
diff --git a/v2/broker/sqs/job.go b/v2/broker/sqs/job.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"strconv"
 	"time"
 )
diff --git a/v2/broker/sqs/queue.go b/v2/broker/sqs/queue.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"strconv"
 	"sync"
 	"sync/atomic"
diff --git a/v2/broker/sqs/stat_test.go b/v2/broker/sqs/stat_test.go
@@ -1,7 +1,7 @@
 package sqs
 
 import (
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/v2/cmd/rr-jobs/jobs/debug.go b/v2/cmd/rr-jobs/jobs/debug.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 	"github.com/spiral/roadrunner/cmd/util"
 	"time"
diff --git a/v2/cmd/rr-jobs/jobs/metrics.go b/v2/cmd/rr-jobs/jobs/metrics.go
@@ -23,7 +23,7 @@ package jobs
 import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 	"github.com/spiral/roadrunner/service/metrics"
 	"github.com/spiral/roadrunner/util"
diff --git a/v2/cmd/rr-jobs/jobs/stat.go b/v2/cmd/rr-jobs/jobs/stat.go
@@ -25,7 +25,7 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 	"github.com/spiral/roadrunner/cmd/util"
 	"net/rpc"
diff --git a/v2/cmd/rr-jobs/jobs/workers.go b/v2/cmd/rr-jobs/jobs/workers.go
@@ -23,7 +23,7 @@ package jobs
 import (
 	tm "github.com/buger/goterm"
 	"github.com/spf13/cobra"
-	"github.com/spiral/jobs"
+	"github.com/spiral/jobs/v2"
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 	"github.com/spiral/roadrunner/cmd/util"
 	"net/rpc"
diff --git a/v2/cmd/rr-jobs/main.go b/v2/cmd/rr-jobs/main.go
@@ -1,18 +1,18 @@
 package main
 
 import (
-	"github.com/spiral/jobs"
-	"github.com/spiral/jobs/broker/amqp"
-	"github.com/spiral/jobs/broker/beanstalk"
-	"github.com/spiral/jobs/broker/ephemeral"
-	"github.com/spiral/jobs/broker/sqs"
+	"github.com/spiral/jobs/v2"
+	"github.com/spiral/jobs/v2/broker/amqp"
+	"github.com/spiral/jobs/v2/broker/beanstalk"
+	"github.com/spiral/jobs/v2/broker/ephemeral"
+	"github.com/spiral/jobs/v2/broker/sqs"
 
 	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
 	"github.com/spiral/roadrunner/service/limit"
 	"github.com/spiral/roadrunner/service/metrics"
 	"github.com/spiral/roadrunner/service/rpc"
 
-	_ "github.com/spiral/jobs/cmd/rr-jobs/jobs"
+	_ "github.com/spiral/jobs/v2/cmd/rr-jobs/jobs"
 )
 
 func main() {
diff --git a/v2/go.mod b/v2/go.mod
@@ -1,4 +1,4 @@
-module github.com/spiral/jobs
+module github.com/spiral/jobs/v2
 
 go 1.14
 
@@ -8,7 +8,6 @@ require (
 	github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gofrs/uuid v3.2.0+incompatible
-	github.com/kr/beanstalk v0.0.0-20180818045031-cae1762e4858
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/prometheus/client_golang v1.5.0
 	github.com/sirupsen/logrus v1.4.2

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package amqp`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"github.com/gofrs/uuid"`
`6`		`- "github.com/spiral/jobs"`
	`6`	`+ "github.com/spiral/jobs/v2"`
`7`	`7`	`"sync"`
`8`	`8`	`"sync/atomic"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package amqp`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/spiral/jobs"`
	`5`	`+ "github.com/spiral/jobs/v2"`
`6`	`6`	`"github.com/streadway/amqp"`
`7`	`7`	`)`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package amqp`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/spiral/jobs"`
	`4`	`+ "github.com/spiral/jobs/v2"`
`5`	`5`	`"github.com/stretchr/testify/assert"`
`6`	`6`	`"testing"`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package beanstalk`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/spiral/jobs"`
	`5`	`+ "github.com/spiral/jobs/v2"`
`6`	`6`	`"sync"`
`7`	`7`	`)`
`8`	`8`