From 44aaf0a4eccebb1d1a25f5563e928bd1bb82d351 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 19 Feb 2022 11:31:23 +0100
Subject: [PATCH] fix: clarify which config file is used on startup

---
 pkg/config/config.go | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 61039865..678b6efd 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -355,12 +355,6 @@ func InitConfig() {
 
 	viper.AddConfigPath(".")
 	viper.SetConfigName("config")
-	err = viper.ReadInConfig()
-	if err != nil {
-		log.Println(err.Error())
-		log.Println("Using default config.")
-		return
-	}
 
 	if CacheType.GetString() == "keyvalue" {
 		CacheType.Set(KeyvalueType.GetString())
@@ -395,7 +389,18 @@ func InitConfig() {
 		MetricsEnabled.Set(true)
 	}
 
-	log.Printf("Using config file: %s", viper.ConfigFileUsed())
+	if viper.ConfigFileUsed() != "" {
+		log.Printf("Using config file: %s", viper.ConfigFileUsed())
+
+		err = viper.ReadInConfig()
+		if err != nil {
+			log.Println(err.Error())
+			log.Println("Using default config.")
+			return
+		}
+	} else {
+		log.Println("No config file found, using default or config from environment variables.")
+	}
 }
 
 func random(length int) (string, error) {