just use the routing key as the queue name, since there's no reason to have a different name

Author: Traun Leyden

ocr_rpc_worker.go

@@ -64,13 +64,17 @@ func (w OcrRpcWorker) Run() error {
 		return err
 	}
 
+	// just use the routing key as the queue name, since there's no reason
+	// to have a different name
+	queueName := w.rabbitConfig.RoutingKey
+
 	queue, err := w.channel.QueueDeclare(
-		w.rabbitConfig.QueueName, // name of the queue
-		true,  // durable
-		false, // delete when usused
-		false, // exclusive
-		false, // noWait
-		nil,   // arguments
+		queueName, // name of the queue
+		true,      // durable
+		false,     // delete when usused
+		false,     // exclusive
+		false,     // noWait
+		nil,       // arguments
 	)
 	if err != nil {
 		return err

preprocessor_rpc_worker.go

@@ -63,20 +63,23 @@ func (w PreprocessorRpcWorker) Run() error {
 		return err
 	}
 
+	// just call the queue the same name as the binding key, since
+	// there is no reason to have a different name.
+	bindingKey := "stroke-width-transform"
+	queueName := bindingKey
+
 	queue, err := w.channel.QueueDeclare(
-		w.rabbitConfig.PreprocessorQueueName, // name of the queue
-		true,  // durable
-		false, // delete when usused
-		false, // exclusive
-		false, // noWait
-		nil,   // arguments
+		queueName, // name of the queue
+		true,      // durable
+		false,     // delete when usused
+		false,     // exclusive
+		false,     // noWait
+		nil,       // arguments
 	)
 	if err != nil {
 		return err
 	}
 
-	bindingKey := "stroke-width-transform"
-
 	if err = w.channel.QueueBind(
 		queue.Name,              // name of the queue
 		bindingKey,              // bindingKey

rabbit_config.go

@@ -5,13 +5,11 @@ import (
 )
 
 type RabbitConfig struct {
-	AmqpURI               string
-	Exchange              string
-	ExchangeType          string
-	RoutingKey            string
-	Reliable              bool
-	QueueName             string
-	PreprocessorQueueName string
+	AmqpURI      string
+	Exchange     string
+	ExchangeType string
+	RoutingKey   string
+	Reliable     bool
 }
 
 func DefaultTestConfig() RabbitConfig {
@@ -21,13 +19,11 @@ func DefaultTestConfig() RabbitConfig {
 	// higher would delay the problem, but then it would still happen later.
 
 	rabbitConfig := RabbitConfig{
-		AmqpURI:               "amqp://guest:guest@localhost:5672/",
-		Exchange:              "open-ocr-exchange3",
-		ExchangeType:          "direct",
-		RoutingKey:            "decode-ocr",
-		Reliable:              false, // setting to false because of observed issues
-		QueueName:             "open-ocr-queue",
-		PreprocessorQueueName: "preprocessor-queue",
+		AmqpURI:      "amqp://guest:guest@localhost:5672/",
+		Exchange:     "open-ocr-exchange",
+		ExchangeType: "direct",
+		RoutingKey:   "decode-ocr",
+		Reliable:     false, // setting to false because of observed issues
 	}
 	return rabbitConfig