Switch to using github.com/gomodule/redigo/redis (#98)

Issue #94

README.md

@@ -20,7 +20,7 @@ To enqueue jobs, you need to make an Enqueuer with a redis namespace and a redig
 package main
 
 import (
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 	"github.com/gocraft/work"
 )
 
@@ -56,7 +56,7 @@ In order to process jobs, you'll need to make a WorkerPool. Add middleware and j
 package main
 
 import (
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 	"github.com/gocraft/work"
 	"os"
 	"os/signal"
@@ -246,11 +246,11 @@ You'll see a view that looks like this:
 ### Processing a job
 
 * To process a job, a worker will execute a Lua script to atomically move a job its queue to an in-progress queue.
-  * A job is dequeued and moved to in-progress if the job queue is not paused and the number of active jobs does not exceed concurrency limit for the job type 
+  * A job is dequeued and moved to in-progress if the job queue is not paused and the number of active jobs does not exceed concurrency limit for the job type
 * The worker will then run the job and increment the job lock. The job will either finish successfully or result in an error or panic.
   * If the process completely crashes, the reaper will eventually find it in its in-progress queue and requeue it.
 * If the job is successful, we'll simply remove the job from the in-progress queue.
-* If the job returns an error or panic, we'll see how many retries a job has left. If it doesn't have any, we'll move it to the dead queue. If it has retries left, we'll consume a retry and add the job to the retry queue. 
+* If the job returns an error or panic, we'll see how many retries a job has left. If it doesn't have any, we'll move it to the dead queue. If it has retries left, we'll consume a retry and add the job to the retry queue.
 
 ### Workers and WorkerPools
 

benches/bench_goworker/main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/benmanns/goworker"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/health"
 	"os"
 	"sync/atomic"
 	"time"
+
+	"github.com/benmanns/goworker"
+	"github.com/gocraft/health"
+	"github.com/gomodule/redigo/redis"
 )
 
 func myJob(queue string, args ...interface{}) error {

benches/bench_goworkers/main.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/health"
-	"github.com/jrallison/go-workers"
 	"os"
 	"sync/atomic"
 	"time"
+
+	"github.com/gocraft/health"
+	"github.com/gomodule/redigo/redis"
 )
 
 func myJob(m *workers.Msg) {

benches/bench_jobs/main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/albrow/jobs"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/health"
 	"os"
 	"sync/atomic"
 	"time"
+
+	"github.com/albrow/jobs"
+	"github.com/gocraft/health"
+	"github.com/gomodule/redigo/redis"
 )
 
 var namespace = "jobs"
@@ -51,8 +52,8 @@ func main() {
 
 	job = stream.NewJob("run_all")
 	pool, err := jobs.NewPool(&jobs.PoolConfig{
-	// NumWorkers: 1000,
-	// BatchSize:  3000,
+		// NumWorkers: 1000,
+		// BatchSize:  3000,
 	})
 	if err != nil {
 		panic(err)

benches/bench_work/main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/health"
-	"github.com/gocraft/work"
 	"os"
 	"sync/atomic"
 	"time"
+
+	"github.com/gocraft/health"
+	"github.com/gocraft/work"
+	"github.com/gomodule/redigo/redis"
 )
 
 var namespace = "bench_test"

client.go

@@ -2,10 +2,11 @@ package work
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
 	"sort"
 	"strconv"
 	"strings"
+
+	"github.com/gomodule/redigo/redis"
 )
 
 // ErrNotDeleted is returned by functions that delete jobs to indicate that although the redis commands were successful,

client_test.go

@@ -2,10 +2,11 @@ package work
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/stretchr/testify/assert"
 )
 
 type TestContext struct{}

cmd/workenqueue/main.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/work"
 	"os"
 	"time"
+
+	"github.com/gocraft/work"
+	"github.com/gomodule/redigo/redis"
 )
 
 var redisHostPort = flag.String("redis", ":6379", "redis hostport")

cmd/workfakedata/main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/gocraft/work"
 	"math/rand"
 	"time"
+
+	"github.com/gocraft/work"
+	"github.com/gomodule/redigo/redis"
 )
 
 var redisHostPort = flag.String("redis", ":6379", "redis hostport")

cmd/workwebui/main.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/garyburd/redigo/redis"
 	"github.com/gocraft/work/webui"
+	"github.com/gomodule/redigo/redis"
 )
 
 var (

dead_pool_reaper.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 )
 
 const (

dead_pool_reaper_test.go

@@ -1,10 +1,11 @@
 package work
 
 import (
-	"github.com/garyburd/redigo/redis"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDeadPoolReaper(t *testing.T) {

enqueue.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 )
 
 // Enqueuer can enqueue jobs.

heartbeater.go

@@ -1,12 +1,12 @@
 package work
 
 import (
-	// "fmt"
-	"github.com/garyburd/redigo/redis"
 	"os"
 	"sort"
 	"strings"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
 )
 
 const (

heartbeater_test.go

@@ -1,11 +1,11 @@
 package work
 
 import (
-	// "fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestHeartbeater(t *testing.T) {

identifier_test.go

@@ -1,8 +1,6 @@
 package work
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestMakeIdentifier(t *testing.T) {
 	id := makeIdentifier()

job_test.go

@@ -1,9 +1,10 @@
 package work
 
 import (
-	"github.com/stretchr/testify/assert"
 	"math"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestJobArgumentExtraction(t *testing.T) {

log.go

@@ -1,8 +1,6 @@
 package work
 
-import (
-	"fmt"
-)
+import "fmt"
 
 func logError(key string, err error) {
 	fmt.Printf("ERROR: %s - %s\n", key, err.Error())

observer.go

@@ -3,8 +3,9 @@ package work
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/garyburd/redigo/redis"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
 )
 
 // An observer observes a single worker. Each worker has its own observer.

observer_test.go

@@ -2,10 +2,10 @@ package work
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/stretchr/testify/assert"
 	"testing"
-	// "time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestObserverStarted(t *testing.T) {

periodic_enqueuer.go

@@ -2,10 +2,11 @@ package work
 
 import (
 	"fmt"
-	"github.com/garyburd/redigo/redis"
-	"github.com/robfig/cron"
 	"math/rand"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/robfig/cron"
 )
 
 const (

periodic_enqueuer_test.go

@@ -1,11 +1,12 @@
 package work
 
 import (
-	"github.com/garyburd/redigo/redis"
-	"github.com/robfig/cron"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/robfig/cron"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPeriodicEnqueuer(t *testing.T) {

priority_sampler_test.go

@@ -2,8 +2,9 @@ package work
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPrioritySampler(t *testing.T) {

requeuer.go

@@ -1,11 +1,10 @@
 package work
 
 import (
-	// "encoding/json"
 	"fmt"
 	"time"
 
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 )
 
 type requeuer struct {

requeuer_test.go

@@ -1,12 +1,9 @@
 package work
 
 import (
-	// "github.com/garyburd/redigo/redis"
-	"github.com/stretchr/testify/assert"
 	"testing"
-	// "fmt"
-	// "time"
-	// "os"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRequeue(t *testing.T) {

run_test.go

@@ -2,9 +2,10 @@ package work
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRunBasicMiddleware(t *testing.T) {

time.go

@@ -1,8 +1,6 @@
 package work
 
-import (
-	"time"
-)
+import "time"
 
 var nowMock int64
 

webui/webui.go

@@ -8,10 +8,10 @@ import (
 	"sync"
 
 	"github.com/braintree/manners"
-	"github.com/garyburd/redigo/redis"
 	"github.com/gocraft/web"
 	"github.com/gocraft/work"
 	"github.com/gocraft/work/webui/internal/assets"
+	"github.com/gomodule/redigo/redis"
 )
 
 // Server implements an HTTP server which exposes a JSON API to view and manage gocraft/work items.