diff --git a/order_client.go b/order_client.go index 8366396..53bd347 100644 --- a/order_client.go +++ b/order_client.go @@ -12,9 +12,7 @@ type UpdateHandler interface { } type RabbitTransportClient struct { - Url string - - OrderTopic string + Url string ClientName string handler UpdateHandler connection *amqp.Connection @@ -22,7 +20,7 @@ type RabbitTransportClient struct { quit chan bool } -func (t *RabbitTransportClient) declareBindAndConsume(topic string) (<-chan amqp.Delivery, error) { +func (t *RabbitTransportClient) declareBindAndConsume() (<-chan amqp.Delivery, error) { q, err := t.channel.QueueDeclare( "order-queue", // name false, // durable @@ -34,10 +32,7 @@ func (t *RabbitTransportClient) declareBindAndConsume(topic string) (<-chan amqp if err != nil { return nil, err } - err = t.channel.QueueBind(q.Name, topic, topic, false, nil) - if err != nil { - return nil, err - } + return t.channel.Consume( q.Name, "", @@ -65,11 +60,11 @@ func (t *RabbitTransportClient) Connect(handler UpdateHandler) error { } t.handler = handler t.channel = ch - toAdd, err := t.declareBindAndConsume(t.OrderTopic) + toAdd, err := t.declareBindAndConsume() if err != nil { return err } - log.Printf("Connected to rabbit order topic: %s", t.OrderTopic) + log.Printf("Connected to rabbit order topic") go func(msgs <-chan amqp.Delivery) { for d := range msgs {