From 5f470b0a97cb5a28bb79735413b60cad4aa0928a Mon Sep 17 00:00:00 2001
From: thijsheijden <hi@thijsheijden.nl>
Date: Tue, 11 May 2021 15:37:53 +0200
Subject: [PATCH] Renamed keyvaluedriver to keyvaluestore
---
internal/drivers/keyvaluedriver/keyvaluedriver.go | 14 +++++++-------
internal/usecases/produce/publishmessage.go | 6 ++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/internal/drivers/keyvaluedriver/keyvaluedriver.go b/internal/drivers/keyvaluedriver/keyvaluedriver.go
index 15c3595..fa59788 100644
--- a/internal/drivers/keyvaluedriver/keyvaluedriver.go
+++ b/internal/drivers/keyvaluedriver/keyvaluedriver.go
@@ -9,18 +9,18 @@ import (
"github.com/go-redis/redis/v8"
)
-// KeyValueDriver models the redis driver
-type KeyValueDriver struct {
+// KeyValueStore models the redis driver
+type KeyValueStore struct {
client *redis.Client
}
// NewRedisDriver creates and returns a redis driver
-func NewRedisDriver() *KeyValueDriver {
- return &KeyValueDriver{}
+func NewRedisDriver() *KeyValueStore {
+ return &KeyValueStore{}
}
// Start starts the redis driver
-func (d *KeyValueDriver) Start() {
+func (d *KeyValueStore) Start() {
// Grab the redis host and port from environment vars
redisAddress := os.Getenv("REDIS_ADDRESS")
// redisPassword := os.Getenv("REDIS_PASSWORD")
@@ -35,12 +35,12 @@ func (d *KeyValueDriver) Start() {
}
// Get retrieves the value from the redis store that belongs to the given key
-func (d *KeyValueDriver) Get(key *string) string {
+func (d *KeyValueStore) Get(key *string) string {
return d.client.Get(context.Background(), *key).Val()
}
// Set sets the key value pair in the redis store
-func (d *KeyValueDriver) Set(key *string, value *string) error {
+func (d *KeyValueStore) Set(key *string, value *string) error {
status := d.client.Set(context.Background(), *key, *value, 0)
return status.Err()
}
diff --git a/internal/usecases/produce/publishmessage.go b/internal/usecases/produce/publishmessage.go
index 8e9b31e..dffd5a8 100644
--- a/internal/usecases/produce/publishmessage.go
+++ b/internal/usecases/produce/publishmessage.go
@@ -1,6 +1,9 @@
package produce
import (
+ "fmt"
+ "query-service/pkg/logger"
+
"github.com/streadway/amqp"
)
@@ -9,9 +12,12 @@ func (s *Service) PublishMessage(data *[]byte, sessionID *string) {
// Use the sessionID to query the key value store to get the queue we need to send this message to
clientQueueID := s.keyValueStore.Get(sessionID)
+ logger.Log(fmt.Sprintf("Found client queue %s for session %s", clientQueueID, *sessionID))
+
// If this client has now disconnected
if clientQueueID == "" {
// TODO: Decide whether to throw away the message or perhaps cache it, for now throw it away
+ logger.Log("No client updater queue ID")
return
}
--
GitLab