From edfb310a59edb6f1b645fc456b03dfcea770e1b4 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Sun, 15 Oct 2023 21:13:43 -0700
Subject: [PATCH] fix: always load ENVs from files first as soon as server
 starts (#18247)

This is a regression from #18231, however reading from ENV files
must happen well before any parsing logic is invoked.
---
 cmd/common-main.go | 2 --
 cmd/server-main.go | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/common-main.go b/cmd/common-main.go
index 12c68b375..1f674c3f2 100644
--- a/cmd/common-main.go
+++ b/cmd/common-main.go
@@ -619,8 +619,6 @@ func loadEnvVarsFromFiles() {
 }
 
 func handleCommonEnvVars() {
-	loadEnvVarsFromFiles()
-
 	var err error
 	globalBrowserEnabled, err = config.ParseBool(env.Get(config.EnvBrowser, config.EnableOn))
 	if err != nil {
diff --git a/cmd/server-main.go b/cmd/server-main.go
index 8a2cdb265..7933bf159 100644
--- a/cmd/server-main.go
+++ b/cmd/server-main.go
@@ -579,6 +579,9 @@ func serverMain(ctx *cli.Context) {
 
 	setDefaultProfilerRates()
 
+	// Always load ENV variables from files first.
+	loadEnvVarsFromFiles()
+
 	// Handle all server command args.
 	bootstrapTrace("serverHandleCmdArgs", func() {
 		serverHandleCmdArgs(ctx)