From 001678b08ad7e73fba129114e823f82997be59e6 Mon Sep 17 00:00:00 2001
From: thijsheijden <hi@thijsheijden.nl>
Date: Tue, 13 Apr 2021 10:24:37 +0200
Subject: [PATCH] Updated exchange and routing key
Also updated Makefile and deployment file.
---
Makefile | 5 +++++
deployments/deployment.yml | 4 ++++
internal/drivers/brokerdriver/broker.go | 4 ++--
internal/usecases/consume/consume.go | 6 ++++++
internal/usecases/consume/handlemessage.go | 1 +
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 5821495..69872af 100644
--- a/Makefile
+++ b/Makefile
@@ -61,3 +61,8 @@ develop:
@go run cmd/query-service/main.go
+docker:
+ make linux
+ @docker build -t query-service:latest .
+ @docker tag query-service:latest datastropheregistry.azurecr.io/query-service\:latest
+ @docker push datastropheregistry.azurecr.io/query-service\:latest
\ No newline at end of file
diff --git a/deployments/deployment.yml b/deployments/deployment.yml
index e5d2106..39d666a 100644
--- a/deployments/deployment.yml
+++ b/deployments/deployment.yml
@@ -38,5 +38,9 @@ spec:
value: redis.redis.svc.cluster.local:6379
- name: LOG_MESSAGES
value: "true"
+ - name: POD_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
imagePullSecrets:
- name: docker-regcred
\ No newline at end of file
diff --git a/internal/drivers/brokerdriver/broker.go b/internal/drivers/brokerdriver/broker.go
index abef043..aa71621 100644
--- a/internal/drivers/brokerdriver/broker.go
+++ b/internal/drivers/brokerdriver/broker.go
@@ -37,8 +37,8 @@ func CreateAliceBroker(gateway brokeradapter.GatewayInterface) *Driver {
// CreateConsumer creates an AliceConsumer on a certain exchange and queue
func (d *Driver) CreateConsumer() Consumer {
- exchangeID := "query-requests"
- routingKey := "aql-user-request"
+ exchangeID := "requests-exchange"
+ routingKey := "aql-query-request"
// Declare the exchange we want to bind to
exchange, err := alice.CreateDefaultExchange(exchangeID, alice.Direct)
diff --git a/internal/usecases/consume/consume.go b/internal/usecases/consume/consume.go
index a2426fe..5555fdd 100644
--- a/internal/usecases/consume/consume.go
+++ b/internal/usecases/consume/consume.go
@@ -1,6 +1,7 @@
package consume
import (
+ "os"
"query-service/internal/drivers/brokerdriver"
"query-service/internal/usecases/convertquery"
"query-service/internal/usecases/produce"
@@ -26,8 +27,13 @@ func NewService(broker brokerdriver.Broker, produceService produce.UseCase, conv
}
}
+var podName string
+
// Start starts consuming
func (s *Service) Start() {
+
+ podName = os.Getenv("POD_NAME")
+
// Create consumer
consumer := s.broker.CreateConsumer()
diff --git a/internal/usecases/consume/handlemessage.go b/internal/usecases/consume/handlemessage.go
index ba9787b..a9658d2 100644
--- a/internal/usecases/consume/handlemessage.go
+++ b/internal/usecases/consume/handlemessage.go
@@ -37,6 +37,7 @@ func (s *Service) HandleMessage(msg *brokeradapter.Message) {
// Add type indicator to result from database
querymap := make(map[string]interface{})
querymap["type"] = "query_result"
+ querymap["pod"] = podName
querymap["values"] = *result
querybyte, err := json.Marshal(querymap)
//fmt.Println(querymap)
--
GitLab