Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Commit b655643

Browse files
rustatianrustatian
authored
Merge pull request #30 from spiral/update_v2
Use v2 tag in the go.mods instead of hash
2 parents db77b8d + e806b1a commit b655643

File tree

130 files changed

+48
-11426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+48
-11426
lines changed

‎broker/amqp/broker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package amqp
33
import (
44
"fmt"
55
"github.com/gofrs/uuid"
6-
"github.com/spiral/jobs"
6+
"github.com/spiral/jobs/v2"
77
"sync"
88
"sync/atomic"
99
)

‎broker/amqp/broker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package amqp
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
"time"

‎broker/amqp/consume_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package amqp
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/stretchr/testify/assert"
77
"testing"
88
"time"

‎broker/amqp/durability_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package amqp
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"io"
77
"net"

‎broker/amqp/job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package amqp
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/streadway/amqp"
77
)
88

‎broker/amqp/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package amqp
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/streadway/amqp"
77
"os"
88
"sync"

‎broker/amqp/stat_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package amqp
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
)

‎broker/beanstalk/broker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package beanstalk
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"sync"
77
)
88

‎broker/beanstalk/broker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package beanstalk
22

33
import (
44
"github.com/beanstalkd/go-beanstalk"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/stretchr/testify/assert"
77
"testing"
88
"time"

‎broker/beanstalk/consume_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package beanstalk
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/stretchr/testify/assert"
77
"testing"
88
"time"

‎broker/beanstalk/durability_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package beanstalk
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"io"
77
"net"

‎broker/beanstalk/job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package beanstalk
33
import (
44
"bytes"
55
"encoding/gob"
6-
"github.com/spiral/jobs"
6+
"github.com/spiral/jobs/v2"
77
)
88

99
func pack(j *jobs.Job) []byte {

‎broker/beanstalk/stat_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package beanstalk
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
"time"

‎broker/beanstalk/tube.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package beanstalk
33
import (
44
"fmt"
55
"github.com/beanstalkd/go-beanstalk"
6-
"github.com/spiral/jobs"
6+
"github.com/spiral/jobs/v2"
77
"strconv"
88
"sync"
99
"sync/atomic"

‎broker/ephemeral/broker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ephemeral
33
import (
44
"fmt"
55
"github.com/gofrs/uuid"
6-
"github.com/spiral/jobs"
6+
"github.com/spiral/jobs/v2"
77
"sync"
88
)
99

‎broker/ephemeral/broker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ephemeral
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
"time"

‎broker/ephemeral/consume_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ephemeral
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/stretchr/testify/assert"
77
"testing"
88
"time"

‎broker/ephemeral/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ephemeral
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"sync"
66
"sync/atomic"
77
"time"

‎broker/ephemeral/stat_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ephemeral
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
)

‎broker/sqs/broker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sqs
33
import (
44
"fmt"
55
"github.com/aws/aws-sdk-go/service/sqs"
6-
"github.com/spiral/jobs"
6+
"github.com/spiral/jobs/v2"
77
"sync"
88
)
99

‎broker/sqs/broker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sqs
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
"time"

‎broker/sqs/consume_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package sqs
22

33
import (
44
"fmt"
5-
"github.com/spiral/jobs"
5+
"github.com/spiral/jobs/v2"
66
"github.com/stretchr/testify/assert"
77
"testing"
88
"time"

‎broker/sqs/durability_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sqs
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"io"
77
"net"

‎broker/sqs/job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"github.com/aws/aws-sdk-go/aws"
66
"github.com/aws/aws-sdk-go/service/sqs"
7-
"github.com/spiral/jobs"
7+
"github.com/spiral/jobs/v2"
88
"strconv"
99
"time"
1010
)

‎broker/sqs/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"github.com/aws/aws-sdk-go/aws"
66
"github.com/aws/aws-sdk-go/service/sqs"
7-
"github.com/spiral/jobs"
7+
"github.com/spiral/jobs/v2"
88
"strconv"
99
"sync"
1010
"sync/atomic"

‎broker/sqs/stat_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sqs
22

33
import (
4-
"github.com/spiral/jobs"
4+
"github.com/spiral/jobs/v2"
55
"github.com/stretchr/testify/assert"
66
"testing"
77
)

‎cmd/rr-jobs/jobs/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"fmt"
2525
"github.com/sirupsen/logrus"
2626
"github.com/spf13/cobra"
27-
"github.com/spiral/jobs"
27+
"github.com/spiral/jobs/v2"
2828
rr "github.com/spiral/roadrunner/cmd/rr/cmd"
2929
"github.com/spiral/roadrunner/cmd/util"
3030
"time"

‎cmd/rr-jobs/jobs/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package jobs
2323
import (
2424
"github.com/prometheus/client_golang/prometheus"
2525
"github.com/spf13/cobra"
26-
"github.com/spiral/jobs"
26+
"github.com/spiral/jobs/v2"
2727
rr "github.com/spiral/roadrunner/cmd/rr/cmd"
2828
"github.com/spiral/roadrunner/service/metrics"
2929
"github.com/spiral/roadrunner/util"

‎cmd/rr-jobs/jobs/stat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/dustin/go-humanize"
2626
"github.com/olekukonko/tablewriter"
2727
"github.com/spf13/cobra"
28-
"github.com/spiral/jobs"
28+
"github.com/spiral/jobs/v2"
2929
rr "github.com/spiral/roadrunner/cmd/rr/cmd"
3030
"github.com/spiral/roadrunner/cmd/util"
3131
"net/rpc"

‎cmd/rr-jobs/jobs/workers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package jobs
2323
import (
2424
tm "github.com/buger/goterm"
2525
"github.com/spf13/cobra"
26-
"github.com/spiral/jobs"
26+
"github.com/spiral/jobs/v2"
2727
rr "github.com/spiral/roadrunner/cmd/rr/cmd"
2828
"github.com/spiral/roadrunner/cmd/util"
2929
"net/rpc"

‎cmd/rr-jobs/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package main
22

33
import (
4-
"github.com/spiral/jobs"
5-
"github.com/spiral/jobs/broker/amqp"
6-
"github.com/spiral/jobs/broker/beanstalk"
7-
"github.com/spiral/jobs/broker/ephemeral"
8-
"github.com/spiral/jobs/broker/sqs"
4+
"github.com/spiral/jobs/v2"
5+
"github.com/spiral/jobs/v2/broker/amqp"
6+
"github.com/spiral/jobs/v2/broker/beanstalk"
7+
"github.com/spiral/jobs/v2/broker/ephemeral"
8+
"github.com/spiral/jobs/v2/broker/sqs"
99

1010
rr "github.com/spiral/roadrunner/cmd/rr/cmd"
1111
"github.com/spiral/roadrunner/service/limit"
1212
"github.com/spiral/roadrunner/service/metrics"
1313
"github.com/spiral/roadrunner/service/rpc"
1414

15-
_ "github.com/spiral/jobs/cmd/rr-jobs/jobs"
15+
_ "github.com/spiral/jobs/v2/cmd/rr-jobs/jobs"
1616
)
1717

1818
func main() {

‎go.mod

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
module github.com/spiral/jobs
1+
module github.com/spiral/jobs/v2
22

3-
go 1.14
3+
go 1.13
44

55
require (
66
github.com/aws/aws-sdk-go v1.16.14
77
github.com/beanstalkd/go-beanstalk v0.0.0-20180822062812-53ecdaa3bcfb
88
github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37
9+
github.com/coreos/go-etcd v2.0.0+incompatible // indirect
10+
github.com/cpuguy83/go-md2man v1.0.10 // indirect
911
github.com/dustin/go-humanize v1.0.0
1012
github.com/gofrs/uuid v3.1.0+incompatible
1113
github.com/kr/beanstalk v0.0.0-20180818045031-cae1762e4858 // indirect
12-
github.com/olekukonko/tablewriter v0.0.1
13-
github.com/prometheus/client_golang v1.0.0
14-
github.com/sirupsen/logrus v1.3.0
15-
github.com/spf13/cobra v0.0.3
16-
github.com/spf13/viper v1.3.1
17-
github.com/spiral/roadrunner v1.4.8
14+
github.com/olekukonko/tablewriter v0.0.4
15+
github.com/prometheus/client_golang v1.5.0
16+
github.com/sirupsen/logrus v1.4.2
17+
github.com/spf13/cobra v0.0.6
18+
github.com/spf13/viper v1.6.2
19+
github.com/spiral/roadrunner v1.6.3
1820
github.com/streadway/amqp v0.0.0-20181205114330-a314942b2fd9
19-
github.com/stretchr/testify v1.3.0
21+
github.com/stretchr/testify v1.5.1
22+
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
2023
)

‎v2/broker.go

-47
This file was deleted.

0 commit comments

Comments
 (0)