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

Commit

Permalink
Merge pull request #30 from spiral/update_v2
Browse files Browse the repository at this point in the history 
Use v2 tag in the go.mods instead of hash
  • Loading branch information
@rustatian
rustatian authored Mar 10, 2020
2 parents db77b8d + e806b1a commit b655643
Show file tree
Hide file tree
Showing 130 changed files with 48 additions and 11,426 deletions.
2 changes: 1 addition & 1 deletion broker/amqp/broker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package amqp
import (
"fmt"
"github.com/gofrs/uuid"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"sync"
"sync/atomic"
)
Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/broker_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package amqp

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/consume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package amqp

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/durability_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package amqp

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"io"
"net"
Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package amqp

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/streadway/amqp"
)

Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package amqp

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/streadway/amqp"
"os"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion broker/amqp/stat_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package amqp

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/broker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package beanstalk

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"sync"
)

Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/broker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/consume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package beanstalk

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/durability_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package beanstalk

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"io"
"net"
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/stat_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package beanstalk

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/beanstalk/tube.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion broker/ephemeral/broker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ephemeral
import (
"fmt"
"github.com/gofrs/uuid"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"sync"
)

Expand Down
2 changes: 1 addition & 1 deletion broker/ephemeral/broker_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ephemeral

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/ephemeral/consume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ephemeral

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/ephemeral/queue.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ephemeral

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"sync"
"sync/atomic"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/ephemeral/stat_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ephemeral

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/broker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/broker_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sqs

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/consume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package sqs

import (
"fmt"
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
"time"
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/durability_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sqs

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"io"
"net"
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion broker/sqs/stat_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sqs

import (
"github.com/spiral/jobs"
"github.com/spiral/jobs/v2"
"github.com/stretchr/testify/assert"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/rr-jobs/jobs/debug.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/rr-jobs/jobs/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/rr-jobs/jobs/stat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/rr-jobs/jobs/workers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cmd/rr-jobs/main.go
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
21 changes: 12 additions & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
module github.com/spiral/jobs
module github.com/spiral/jobs/v2

go 1.14
go 1.13

require (
github.com/aws/aws-sdk-go v1.16.14
github.com/beanstalkd/go-beanstalk v0.0.0-20180822062812-53ecdaa3bcfb
github.com/buger/goterm v0.0.0-20181115115552-c206103e1f37
github.com/coreos/go-etcd v2.0.0+incompatible // indirect
github.com/cpuguy83/go-md2man v1.0.10 // indirect
github.com/dustin/go-humanize v1.0.0
github.com/gofrs/uuid v3.1.0+incompatible
github.com/kr/beanstalk v0.0.0-20180818045031-cae1762e4858 // indirect
github.com/olekukonko/tablewriter v0.0.1
github.com/prometheus/client_golang v1.0.0
github.com/sirupsen/logrus v1.3.0
github.com/spf13/cobra v0.0.3
github.com/spf13/viper v1.3.1
github.com/spiral/roadrunner v1.4.8
github.com/olekukonko/tablewriter v0.0.4
github.com/prometheus/client_golang v1.5.0
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.6
github.com/spf13/viper v1.6.2
github.com/spiral/roadrunner v1.6.3
github.com/streadway/amqp v0.0.0-20181205114330-a314942b2fd9
github.com/stretchr/testify v1.3.0
github.com/stretchr/testify v1.5.1
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
)
47 changes: 0 additions & 47 deletions v2/broker.go
View file

This file was deleted.

Loading

0 comments on commit b655643

Please sign in to comment.