Change empty config check

topfreegames · Sep 26, 2023 · 04720e4 · 04720e4
1 parent c6882f3
commit 04720e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/api/app.go b/api/app.go
@@ -220,11 +220,15 @@ func (app *App) loadConfiguration() error {
 
 func (app *App) configureEnrichment() {
 	// If a specific Redis instance is not provided, use the same one as the rest of the service.
-	if app.ParsedConfig.Enrichment.Cache == nil {
+	if app.ParsedConfig.Enrichment.Cache.Addr == "" {
 		host := app.Config.GetString("redis.host")
 		port := app.Config.GetInt("redis.port")
+		password := app.Config.GetString("redis.password")
 
-		app.ParsedConfig.Enrichment.Cache = &config.Cache{Addr: fmt.Sprintf("%s:%d", host, port)}
+		app.ParsedConfig.Enrichment.Cache = config.Cache{
+			Addr:     fmt.Sprintf("%s:%d", host, port),
+			Password: password,
+		}
 	}
 
 	redisClient := redis.NewClient(&redis.Options{

diff --git a/config/config.go b/config/config.go
@@ -43,7 +43,7 @@ type (
 		// WebhookTimeout is the timeout for the webhook call.
 		WebhookTimeout time.Duration `mapstructure:"webhook_timeout"`
 
-		Cache *Cache `mapstructure:"cache"`
+		Cache Cache `mapstructure:"cache"`
 	}
 
 	Cache struct {

diff --git a/config/default.yaml b/config/default.yaml
@@ -38,7 +38,7 @@ enrichment:
   cache:
     disabled: false
     ttl: 24h
-    addrs: "localhost:6739"
+    addrs: ""
     username: ""
   webhook_timeout: 500ms
   cloud_save: