MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 07:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: always load ENVs from files first as soon as server starts (#18247)

Browse Source 
This is a regression from #18231, however reading from ENV files
must happen well before any parsing logic is invoked.
This commit is contained in:
Harshavardhana 2023-10-15 21:13:43 -07:00 committed by GitHub
parent a2312028b9
commit edfb310a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/common-main.go
View File

@ -619,8 +619,6 @@ func loadEnvVarsFromFiles() {
} }
func handleCommonEnvVars() { func handleCommonEnvVars() {
loadEnvVarsFromFiles()
var err error var err error
globalBrowserEnabled, err = config.ParseBool(env.Get(config.EnvBrowser, config.EnableOn)) globalBrowserEnabled, err = config.ParseBool(env.Get(config.EnvBrowser, config.EnableOn))
if err != nil { if err != nil {

3
cmd/server-main.go
View File

@ -579,6 +579,9 @@ func serverMain(ctx *cli.Context) {
setDefaultProfilerRates() setDefaultProfilerRates()
// Always load ENV variables from files first.
loadEnvVarsFromFiles()
// Handle all server command args. // Handle all server command args.
bootstrapTrace("serverHandleCmdArgs", func() { bootstrapTrace("serverHandleCmdArgs", func() {
serverHandleCmdArgs(ctx) serverHandleCmdArgs(ctx)