@ -28,17 +28,17 @@ import (
)
// Config version
const v19 = "19 "
const v20 = "20 "
var (
// serverConfig server config.
serverConfig * serverConfigV19
serverConfig * serverConfigV20
serverConfigMu sync . RWMutex
)
// serverConfigV19 server configuration version '19 ' which is like
// version '18' except it adds support for MQTT notifications.
type serverConfigV19 struct {
// serverConfigV20 server configuration version '20 ' which is like
// version '19' except it adds support for VirtualHostDomain
type serverConfigV20 struct {
sync . RWMutex
Version string ` json:"version" `
@ -46,6 +46,7 @@ type serverConfigV19 struct {
Credential auth . Credentials ` json:"credential" `
Region string ` json:"region" `
Browser BrowserFlag ` json:"browser" `
Domain string ` json:"domain" `
// Additional error logging configuration.
Logger * loggers ` json:"logger" `
@ -55,7 +56,7 @@ type serverConfigV19 struct {
}
// GetVersion get current config version.
func ( s * serverConfigV19 ) GetVersion ( ) string {
func ( s * serverConfigV20 ) GetVersion ( ) string {
s . RLock ( )
defer s . RUnlock ( )
@ -63,7 +64,7 @@ func (s *serverConfigV19) GetVersion() string {
}
// SetRegion set a new region.
func ( s * serverConfigV19 ) SetRegion ( region string ) {
func ( s * serverConfigV20 ) SetRegion ( region string ) {
s . Lock ( )
defer s . Unlock ( )
@ -72,7 +73,7 @@ func (s *serverConfigV19) SetRegion(region string) {
}
// GetRegion get current region.
func ( s * serverConfigV19 ) GetRegion ( ) string {
func ( s * serverConfigV20 ) GetRegion ( ) string {
s . RLock ( )
defer s . RUnlock ( )
@ -80,7 +81,7 @@ func (s *serverConfigV19) GetRegion() string {
}
// SetCredentials set new credentials. SetCredential returns the previous credential.
func ( s * serverConfigV19 ) SetCredential ( creds auth . Credentials ) ( prevCred auth . Credentials ) {
func ( s * serverConfigV20 ) SetCredential ( creds auth . Credentials ) ( prevCred auth . Credentials ) {
s . Lock ( )
defer s . Unlock ( )
@ -95,7 +96,7 @@ func (s *serverConfigV19) SetCredential(creds auth.Credentials) (prevCred auth.C
}
// GetCredentials get current credentials.
func ( s * serverConfigV19 ) GetCredential ( ) auth . Credentials {
func ( s * serverConfigV20 ) GetCredential ( ) auth . Credentials {
s . RLock ( )
defer s . RUnlock ( )
@ -103,7 +104,7 @@ func (s *serverConfigV19) GetCredential() auth.Credentials {
}
// SetBrowser set if browser is enabled.
func ( s * serverConfigV19 ) SetBrowser ( b bool ) {
func ( s * serverConfigV20 ) SetBrowser ( b bool ) {
s . Lock ( )
defer s . Unlock ( )
@ -112,7 +113,7 @@ func (s *serverConfigV19) SetBrowser(b bool) {
}
// GetCredentials get current credentials.
func ( s * serverConfigV19 ) GetBrowser ( ) bool {
func ( s * serverConfigV20 ) GetBrowser ( ) bool {
s . RLock ( )
defer s . RUnlock ( )
@ -120,7 +121,7 @@ func (s *serverConfigV19) GetBrowser() bool {
}
// Save config.
func ( s * serverConfigV19 ) Save ( ) error {
func ( s * serverConfigV20 ) Save ( ) error {
s . RLock ( )
defer s . RUnlock ( )
@ -128,9 +129,9 @@ func (s *serverConfigV19) Save() error {
return quick . Save ( getConfigFile ( ) , s )
}
func newServerConfigV19 ( ) * serverConfigV19 {
srvCfg := & serverConfigV19 {
Version : v19 ,
func newServerConfigV20 ( ) * serverConfigV20 {
srvCfg := & serverConfigV20 {
Version : v20 ,
Credential : auth . MustGetNewCredentials ( ) ,
Region : globalMinioDefaultRegion ,
Browser : true ,
@ -168,7 +169,7 @@ func newServerConfigV19() *serverConfigV19 {
// found, otherwise use default parameters
func newConfig ( ) error {
// Initialize server config.
srvCfg := newServerConfigV19 ( )
srvCfg := newServerConfigV20 ( )
// If env is set override the credentials from config file.
if globalIsEnvCreds {
@ -183,6 +184,10 @@ func newConfig() error {
srvCfg . SetRegion ( globalServerRegion )
}
if globalIsEnvDomainName {
srvCfg . Domain = globalDomainName
}
// hold the mutex lock before a new config is assigned.
// Save the new config globally.
// unlock the mutex.
@ -246,8 +251,8 @@ func checkDupJSONKeys(json string) error {
}
// getValidConfig - returns valid server configuration
func getValidConfig ( ) ( * serverConfigV19 , error ) {
srvCfg := & serverConfigV19 {
func getValidConfig ( ) ( * serverConfigV20 , error ) {
srvCfg := & serverConfigV20 {
Region : globalMinioDefaultRegion ,
Browser : true ,
}
@ -257,8 +262,8 @@ func getValidConfig() (*serverConfigV19, error) {
return nil , err
}
if srvCfg . Version != v19 {
return nil , fmt . Errorf ( "configuration version mismatch. Expected: ‘%s’, Got: ‘%s’" , v19 , srvCfg . Version )
if srvCfg . Version != v20 {
return nil , fmt . Errorf ( "configuration version mismatch. Expected: ‘%s’, Got: ‘%s’" , v20 , srvCfg . Version )
}
// Load config file json and check for duplication json keys
@ -312,6 +317,10 @@ func loadConfig() error {
srvCfg . SetRegion ( globalServerRegion )
}
if globalIsEnvDomainName {
srvCfg . Domain = globalDomainName
}
// hold the mutex lock before a new config is assigned.
serverConfigMu . Lock ( )
serverConfig = srvCfg
@ -324,6 +333,9 @@ func loadConfig() error {
if ! globalIsEnvRegion {
globalServerRegion = serverConfig . GetRegion ( )
}
if ! globalIsEnvDomainName {
globalDomainName = serverConfig . Domain
}
serverConfigMu . Unlock ( )
return nil
Krishna Srinivas
7 years ago
committed by