From 16e47dddc112c4a81631a5d860cd4114ff924f81 Mon Sep 17 00:00:00 2001
From: Kailash Nadh <kailash@nadh.in>
Date: Fri, 7 Aug 2020 18:08:24 +0530
Subject: [PATCH] Load env config before DB initialisation

---
 main.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 41eff15..6af1e37 100644
--- a/main.go
+++ b/main.go
@@ -79,6 +79,14 @@ func init() {
 	// Load config files to pick up the database settings first.
 	initConfigFiles(ko.Strings("config"), ko)
 
+	// Load environment variables and merge into the loaded config.
+	if err := ko.Load(env.Provider("LISTMONK_", ".", func(s string) string {
+		return strings.Replace(strings.ToLower(
+			strings.TrimPrefix(s, "LISTMONK_")), "__", ".", -1)
+	}), nil); err != nil {
+		lo.Fatalf("error loading config from env: %v", err)
+	}
+
 	// Connect to the database, load the filesystem to read SQL queries.
 	db = initDB()
 	fs = initFS(ko.String("static-dir"))
@@ -104,13 +112,6 @@ func init() {
 	// Load settings from DB.
 	initSettings(queries)
 
-	// Load environment variables and merge into the loaded config.
-	if err := ko.Load(env.Provider("LISTMONK_", ".", func(s string) string {
-		return strings.Replace(strings.ToLower(
-			strings.TrimPrefix(s, "LISTMONK_")), "__", ".", -1)
-	}), nil); err != nil {
-		lo.Fatalf("error loading config from env: %v", err)
-	}
 }
 
 func main() {