Merge pull request #50 from siad007/routingKey

Add amqp routing key.

Author: rustatian

broker/amqp/broker.go

@@ -69,7 +69,7 @@ func (b *Broker) Serve() (err error) {
 	defer b.consume.Close()
 
 	for _, q := range b.queues {
-		err := q.declare(b.publish, q.name, q.name, nil)
+		err := q.declare(b.publish, q.name, q.key, nil)
 		if err != nil {
 			b.mu.Unlock()
 			return err

broker/amqp/broker_test.go

@@ -256,3 +256,70 @@ func TestBroker_StatNotRegistered(t *testing.T) {
 	_, err = b.Stat(pipe)
 	assert.Error(t, err)
 }
+
+func TestBroker_Queue_RoutingKey(t *testing.T) {
+	pipeWithKey := pipe.With("routing-key", "rr-exchange-routing-key")
+
+	assert.Equal(t, pipeWithKey.String("routing-key", ""), "rr-exchange-routing-key")
+}
+
+func TestBroker_Register_With_RoutingKey(t *testing.T) {
+	b := &Broker{}
+	_, err := b.Init(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pipeWithKey := pipe.With("routing-key", "rr-exchange-routing-key")
+
+	assert.NoError(t, b.Register(&pipeWithKey))
+}
+
+func TestBroker_Consume_With_RoutingKey(t *testing.T) {
+	b := &Broker{}
+	_, err := b.Init(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pipeWithKey := pipe.With("routing-key", "rr-exchange-routing-key")
+
+	err = b.Register(&pipeWithKey)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ready := make(chan interface{})
+	b.Listen(func(event int, ctx interface{}) {
+		if event == jobs.EventBrokerReady {
+			close(ready)
+		}
+	})
+
+	exec := make(chan jobs.Handler, 1)
+	assert.NoError(t, b.Consume(&pipeWithKey, exec, func(id string, j *jobs.Job, err error) {}))
+
+	go func() { assert.NoError(t, b.Serve()) }()
+	defer b.Stop()
+
+	<-ready
+
+	jid, perr := b.Push(&pipeWithKey, &jobs.Job{
+		Job:     "test",
+		Payload: "body",
+		Options: &jobs.Options{},
+	})
+
+	assert.NotEqual(t, "", jid)
+	assert.NoError(t, perr)
+
+	waitJob := make(chan interface{})
+	exec <- func(id string, j *jobs.Job) error {
+		assert.Equal(t, jid, id)
+		assert.Equal(t, "body", j.Payload)
+		close(waitJob)
+		return nil
+	}
+
+	<-waitJob
+}

broker/amqp/queue.go

@@ -11,10 +11,10 @@ import (
 )
 
 type queue struct {
-	active         int32
-	pipe           *jobs.Pipeline
-	exchange, name string
-	consumer       string
+	active              int32
+	pipe                *jobs.Pipeline
+	exchange, name, key string
+	consumer            string
 
 	// active consuming channel
 	muc sync.Mutex
@@ -42,6 +42,7 @@ func newQueue(pipe *jobs.Pipeline, lsn func(event int, ctx interface{})) (*queue
 	return &queue{
 		exchange: pipe.String("exchange", "amqp.direct"),
 		name:     pipe.String("queue", ""),
+		key:      pipe.String("routing-key", pipe.String("queue", "")),
 		consumer: pipe.String("consumer", fmt.Sprintf("rr-jobs:%s-%v", pipe.Name(), os.Getpid())),
 		pipe:     pipe,
 		lsn:      lsn,
@@ -169,11 +170,12 @@ func (q *queue) publish(cp *chanPool, id string, attempt int, j *jobs.Job, delay
 		return err
 	}
 
-	qName := q.name
+	qKey := q.key
 
 	if delay != 0 {
 		delayMs := int64(delay.Seconds() * 1000)
-		qName = fmt.Sprintf("delayed-%d.%s.%s", delayMs, q.exchange, q.name)
+		qName := fmt.Sprintf("delayed-%d.%s.%s", delayMs, q.exchange, q.name)
+		qKey = qName
 
 		err := q.declare(cp, qName, qName, amqp.Table{
 			"x-dead-letter-exchange":    q.exchange,
@@ -189,7 +191,7 @@ func (q *queue) publish(cp *chanPool, id string, attempt int, j *jobs.Job, delay
 
 	err = c.ch.Publish(
 		q.exchange, // exchange
-		qName,      // routing key
+		qKey,      // routing key
 		false,      // mandatory
 		false,      // immediate
 		amqp.Publishing{