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

Use loadCachedConfigs appropriately to load ENVs (#7187)

Browse Source
This commit is contained in:
Harshavardhana 2019-02-03 21:01:11 -08:00 committed by Nitish Tiwari
parent 6f08edfb36
commit ea6d61ab1f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/config-current.go
View File

@ -282,7 +282,7 @@ func (s *serverConfig) loadFromEnvs() {
if jwksURL, ok := os.LookupEnv("MINIO_IAM_JWKS_URL"); ok { if jwksURL, ok := os.LookupEnv("MINIO_IAM_JWKS_URL"); ok {
if u, err := xnet.ParseURL(jwksURL); err == nil { if u, err := xnet.ParseURL(jwksURL); err == nil {
s.OpenID.JWKS.URL = u s.OpenID.JWKS.URL = u
s.OpenID.JWKS.PopulatePublicKey() logger.FatalIf(s.OpenID.JWKS.PopulatePublicKey(), "Unable to populate public key from JWKS URL")
} }
} }

3
cmd/gateway-main.go
View File

@ -203,6 +203,9 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
// Override any values from ENVs. // Override any values from ENVs.
srvCfg.loadFromEnvs() srvCfg.loadFromEnvs()
// Load values to cached global values.
srvCfg.loadToCachedConfigs()
// hold the mutex lock before a new config is assigned. // hold the mutex lock before a new config is assigned.
globalServerConfigMu.Lock() globalServerConfigMu.Lock()
globalServerConfig = srvCfg globalServerConfig = srvCfg