Merge 3eb7ab0 into 17631e1

gocelery · Aug 20, 2019 · bc5cae7 · bc5cae7
2 parents 17631e1 + 3eb7ab0
commit bc5cae7
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ Run Celery Worker implemented in Go
 ```go
 // initialize celery client
 cli, _ := NewCeleryClient(
-	NewRedisCeleryBroker("redis://"),
+	NewRedisCeleryBroker("redis://", ""),
 	NewRedisCeleryBackend("redis://"),
 	5, // number of workers
 )
@@ -131,7 +131,7 @@ Submit Task from Go Client
 func main() {
     // initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		1,
 	)

diff --git a/example/goclient/main.go b/example/goclient/main.go
@@ -20,7 +20,7 @@ func main() {
 
 	// initialize celery client
 	cli, _ := gocelery.NewCeleryClient(
-		gocelery.NewRedisCeleryBroker("redis://"),
+		gocelery.NewRedisCeleryBroker("redis://", ""),
 		gocelery.NewRedisCeleryBackend("redis://"),
 		1,
 	)

diff --git a/example/goworker/main.go b/example/goworker/main.go
@@ -49,7 +49,7 @@ func main() {
 
 	// initialize celery client
 	cli, _ := gocelery.NewCeleryClient(
-		gocelery.NewRedisCeleryBroker("redis://"),
+		gocelery.NewRedisCeleryBroker("redis://", ""),
 		gocelery.NewRedisCeleryBackend("redis://"),
 		5, // number of workers
 	)

diff --git a/example_client_named_arg_test.go b/example_client_named_arg_test.go
@@ -15,7 +15,7 @@ func Example_clientWithNamedArguments() {
 
 	// initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		1,
 	)

diff --git a/example_client_test.go b/example_client_test.go
@@ -15,7 +15,7 @@ func Example_client() {
 
 	// initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		1,
 	)

diff --git a/example_worker_named_arg_test.go b/example_worker_named_arg_test.go
@@ -47,7 +47,7 @@ func Example_workerWithNamedArguments() {
 
 	// initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		5, // number of workers
 	)

diff --git a/example_worker_test.go b/example_worker_test.go
@@ -10,7 +10,7 @@ func Example_worker() {
 
 	// initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		5, // number of workers
 	)

diff --git a/example_worker_with_context_test.go b/example_worker_with_context_test.go
@@ -13,7 +13,7 @@ func Example_workerWithContext() {
 
 	// initialize celery client
 	cli, _ := NewCeleryClient(
-		NewRedisCeleryBroker("redis://"),
+		NewRedisCeleryBroker("redis://", ""),
 		NewRedisCeleryBackend("redis://"),
 		1,
 	)

diff --git a/gocelery_test.go b/gocelery_test.go
@@ -17,7 +17,7 @@ import (
 const TIMEOUT = 2 * time.Second
 
 var (
-	redisBroker  = NewRedisCeleryBroker("redis://")
+	redisBroker  = NewRedisCeleryBroker("redis://", "")
 	redisBackend = NewRedisCeleryBackend("redis://")
 	amqpBroker   = NewAMQPCeleryBroker("amqp://")
 	amqpBackend  = NewAMQPCeleryBackend("amqp://")

diff --git a/redis_broker.go b/redis_broker.go
@@ -38,10 +38,14 @@ func NewRedisPool(uri string) *redis.Pool {
 }
 
 // NewRedisCeleryBroker creates new RedisCeleryBroker based on given uri
-func NewRedisCeleryBroker(uri string) *RedisCeleryBroker {
+func NewRedisCeleryBroker(uri string, queuename string) *RedisCeleryBroker {
+	qName := "celery"
+	if queuename != "" {
+		qName = queuename
+	}
 	return &RedisCeleryBroker{
 		Pool:      NewRedisPool(uri),
-		queueName: "celery",
+		queueName: qName,
 	}
 }
 
@@ -72,7 +76,7 @@ func (cb *RedisCeleryBroker) GetCeleryMessage() (*CeleryMessage, error) {
 		return nil, fmt.Errorf("null message received from redis")
 	}
 	messageList := messageJSON.([]interface{})
-	if string(messageList[0].([]byte)) != "celery" {
+	if string(messageList[0].([]byte)) != cb.queueName {
 		return nil, fmt.Errorf("not a celery message: %v", messageList[0])
 	}
 	var message CeleryMessage