fix: Fixing routing key configuration

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Dec 4, 2021 · 7d6ce06 · 7d6ce06
1 parent fa74432
commit 7d6ce06
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Usage of exas:
   -amqpRetryInterval string
         [amqp] Interval duration when send fails {EXAS_AMQP_RETRY_INTERVAL} (default "1h")
   -amqpRoutingKey string
-        [amqp] RoutingKey name {EXAS_AMQP_ROUTING_KEY} (default "exif")
+        [amqp] RoutingKey name {EXAS_AMQP_ROUTING_KEY} (default "exif_input")
   -amqpURI string
         [amqp] Address in the form amqps?://<user>:<password>@<address>:<port>/<vhost> {EXAS_AMQP_URI}
   -cert string
@@ -106,7 +106,7 @@ Usage of exas:
   -readTimeout string
         [server] Read Timeout {EXAS_READ_TIMEOUT} (default "2m")
   -routingKey string
-        [exas] AMQP Routing Key for fibr {EXAS_ROUTING_KEY} (default "exif")
+        [exas] AMQP Routing Key to fibr {EXAS_ROUTING_KEY} (default "exif_output")
   -shutdownTimeout string
         [server] Shutdown Timeout {EXAS_SHUTDOWN_TIMEOUT} (default "10s")
   -tmpFolder string

diff --git a/cmd/exas/api.go b/cmd/exas/api.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"os"
 
@@ -33,7 +34,7 @@ func main() {
 	geocodeConfig := geocode.Flags(fs, "")
 
 	amqpConfig := amqp.Flags(fs, "amqp")
-	amqphandlerConfig := amqphandler.Flags(fs, "amqp", flags.NewOverride("Exchange", "fibr"), flags.NewOverride("Queue", "exas"), flags.NewOverride("RoutingKey", "exif"))
+	amqphandlerConfig := amqphandler.Flags(fs, "amqp", flags.NewOverride("Exchange", "fibr"), flags.NewOverride("Queue", "exas"), flags.NewOverride("RoutingKey", "exif_input"))
 
 	logger.Fatal(fs.Parse(os.Args[1:]))
 
@@ -51,9 +52,9 @@ func main() {
 	defer geocodeApp.Close()
 
 	amqpClient, err := amqp.New(amqpConfig, prometheusApp.Registerer())
-	if err != nil {
+	if err != nil && !errors.Is(err, amqp.ErrNoConfig) {
 		logger.Error("unable to create amqp client: %s", err)
-	} else {
+	} else if amqpClient != nil {
 		defer amqpClient.Close()
 	}
 

diff --git a/pkg/exas/exas.go b/pkg/exas/exas.go
@@ -53,7 +53,7 @@ func Flags(fs *flag.FlagSet, prefix string, overrides ...flags.Override) Config
 		workingDir: flags.New(prefix, "exas", "WorkDir").Default("", overrides).Label("Working directory for direct access requests").ToString(fs),
 
 		amqpExchange:   flags.New(prefix, "exas", "Exchange").Default("fibr", nil).Label("AMQP Exchange Name").ToString(fs),
-		amqpRoutingKey: flags.New(prefix, "exas", "RoutingKey").Default("exif", nil).Label("AMQP Routing Key for fibr").ToString(fs),
+		amqpRoutingKey: flags.New(prefix, "exas", "RoutingKey").Default("exif_output", nil).Label("AMQP Routing Key to fibr").ToString(fs),
 	}
 }