From ea6d61ab1f90a0370ef451738e4d4d72274f99db Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 3 Feb 2019 21:01:11 -0800 Subject: [PATCH] Use loadCachedConfigs appropriately to load ENVs (#7187) --- cmd/config-current.go | 2 +- cmd/gateway-main.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/config-current.go b/cmd/config-current.go index 89172b0e8..69722feb4 100644 --- a/cmd/config-current.go +++ b/cmd/config-current.go @@ -282,7 +282,7 @@ func (s *serverConfig) loadFromEnvs() { if jwksURL, ok := os.LookupEnv("MINIO_IAM_JWKS_URL"); ok { if u, err := xnet.ParseURL(jwksURL); err == nil { s.OpenID.JWKS.URL = u - s.OpenID.JWKS.PopulatePublicKey() + logger.FatalIf(s.OpenID.JWKS.PopulatePublicKey(), "Unable to populate public key from JWKS URL") } } diff --git a/cmd/gateway-main.go b/cmd/gateway-main.go index 860e96920..d92faaa5b 100644 --- a/cmd/gateway-main.go +++ b/cmd/gateway-main.go @@ -203,6 +203,9 @@ func StartGateway(ctx *cli.Context, gw Gateway) { // Override any values from ENVs. srvCfg.loadFromEnvs() + // Load values to cached global values. + srvCfg.loadToCachedConfigs() + // hold the mutex lock before a new config is assigned. globalServerConfigMu.Lock() globalServerConfig = srvCfg