Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify API NewRedisCeleryBroker, add parameters queueName. #122

Closed
wants to merge 2 commits into from
Closed

Modify API NewRedisCeleryBroker, add parameters queueName. #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6216127
Modify API NewRedisCeleryBroker, add parameters queueName. Because i …
YYYGH Aug 18, 2019
3eb7ab0
Modify API NewRedisCeleryBroker, fix parameters error calling NewRedi…
YYYGH Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -131,7 +131,7 @@ Submit Task from Go Client
func main() {
// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
1,
)
Expand Down
2 changes: 1 addition & 1 deletion example/goclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func main() {

// initialize celery client
cli, _ := gocelery.NewCeleryClient(
gocelery.NewRedisCeleryBroker("redis://"),
gocelery.NewRedisCeleryBroker("redis://", ""),
gocelery.NewRedisCeleryBackend("redis://"),
1,
)
Expand Down
2 changes: 1 addition & 1 deletion example/goworker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion example_client_named_arg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func Example_clientWithNamedArguments() {

// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
1,
)
Expand Down
2 changes: 1 addition & 1 deletion example_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func Example_client() {

// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
1,
)
Expand Down
2 changes: 1 addition & 1 deletion example_worker_named_arg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func Example_workerWithNamedArguments() {

// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
5, // number of workers
)
Expand Down
2 changes: 1 addition & 1 deletion example_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ func Example_worker() {

// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
5, // number of workers
)
Expand Down
2 changes: 1 addition & 1 deletion example_worker_with_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func Example_workerWithContext() {

// initialize celery client
cli, _ := NewCeleryClient(
NewRedisCeleryBroker("redis://"),
NewRedisCeleryBroker("redis://", ""),
NewRedisCeleryBackend("redis://"),
1,
)
Expand Down
2 changes: 1 addition & 1 deletion gocelery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://")
Expand Down
10 changes: 7 additions & 3 deletions redis_broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down Expand Up @@ -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
Expand Down