MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 01:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

server/config: config should be updated only when we edit the credentials. (#2345)

Browse Source
This commit is contained in:
Harshavardhana 2016-08-02 16:48:21 -07:00 committed by GitHub
parent 69fd196471
commit 2db51e9d61
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server-main.go
View File

@ -158,14 +158,9 @@ func initServerConfig(c *cli.Context) {
err := createCertsPath() err := createCertsPath()
fatalIf(err, "Unable to create \"certs\" directory.") fatalIf(err, "Unable to create \"certs\" directory.")
// Save new config.
err = serverConfig.Save()
fatalIf(err, "Unable to save config.")
// Fetch max conn limit from environment variable. // Fetch max conn limit from environment variable.
if maxConnStr := os.Getenv("MINIO_MAXCONN"); maxConnStr != "" { if maxConnStr := os.Getenv("MINIO_MAXCONN"); maxConnStr != "" {
// We need to parse to its integer value. // We need to parse to its integer value.
var err error
globalMaxConn, err = strconv.Atoi(maxConnStr) globalMaxConn, err = strconv.Atoi(maxConnStr)
fatalIf(err, "Unable to convert MINIO_MAXCONN=%s environment variable into its integer value.", maxConnStr) fatalIf(err, "Unable to convert MINIO_MAXCONN=%s environment variable into its integer value.", maxConnStr)
} }
@ -173,7 +168,6 @@ func initServerConfig(c *cli.Context) {
// Fetch max cache size from environment variable. // Fetch max cache size from environment variable.
if maxCacheSizeStr := os.Getenv("MINIO_CACHE_SIZE"); maxCacheSizeStr != "" { if maxCacheSizeStr := os.Getenv("MINIO_CACHE_SIZE"); maxCacheSizeStr != "" {
// We need to parse cache size to its integer value. // We need to parse cache size to its integer value.
var err error
globalMaxCacheSize, err = strconvBytes(maxCacheSizeStr) globalMaxCacheSize, err = strconvBytes(maxCacheSizeStr)
fatalIf(err, "Unable to convert MINIO_CACHE_SIZE=%s environment variable into its integer value.", maxCacheSizeStr) fatalIf(err, "Unable to convert MINIO_CACHE_SIZE=%s environment variable into its integer value.", maxCacheSizeStr)
} }
@ -181,7 +175,6 @@ func initServerConfig(c *cli.Context) {
// Fetch cache expiry from environment variable. // Fetch cache expiry from environment variable.
if cacheExpiryStr := os.Getenv("MINIO_CACHE_EXPIRY"); cacheExpiryStr != "" { if cacheExpiryStr := os.Getenv("MINIO_CACHE_EXPIRY"); cacheExpiryStr != "" {
// We need to parse cache expiry to its time.Duration value. // We need to parse cache expiry to its time.Duration value.
var err error
globalCacheExpiry, err = time.ParseDuration(cacheExpiryStr) globalCacheExpiry, err = time.ParseDuration(cacheExpiryStr)
fatalIf(err, "Unable to convert MINIO_CACHE_EXPIRY=%s environment variable into its time.Duration value.", cacheExpiryStr) fatalIf(err, "Unable to convert MINIO_CACHE_EXPIRY=%s environment variable into its time.Duration value.", cacheExpiryStr)
} }
@ -198,10 +191,14 @@ func initServerConfig(c *cli.Context) {
if !isValidSecretKey.MatchString(secretKey) { if !isValidSecretKey.MatchString(secretKey) {
fatalIf(errInvalidArgument, "Invalid secret key.") fatalIf(errInvalidArgument, "Invalid secret key.")
} }
// Set new credentials.
serverConfig.SetCredential(credential{ serverConfig.SetCredential(credential{
AccessKeyID: accessKey, AccessKeyID: accessKey,
SecretAccessKey: secretKey, SecretAccessKey: secretKey,
}) })
// Save new config.
err = serverConfig.Save()
fatalIf(err, "Unable to save config.")
} }
// Set maxOpenFiles, This is necessary since default operating // Set maxOpenFiles, This is necessary since default operating