Merge pull request #1038 from harshavardhana/shadow

server: Fix shadowing bug reported by go vet on go1.6beta2
master
Anand Babu (AB) Periasamy 9 years ago
commit 9cb590d800
  1. 4
      server-main.go

@ -202,12 +202,12 @@ func getConfig() (*configV2, *probe.Error) {
if err != nil { if err != nil {
if os.IsNotExist(err.ToGoError()) { if os.IsNotExist(err.ToGoError()) {
// Initialize new config, since config file doesn't exist yet // Initialize new config, since config file doesn't exist yet
config := &configV2{} config = &configV2{}
config.Version = "2" config.Version = "2"
config.Credentials.AccessKeyID = string(mustGenerateAccessKeyID()) config.Credentials.AccessKeyID = string(mustGenerateAccessKeyID())
config.Credentials.SecretAccessKey = string(mustGenerateSecretAccessKey()) config.Credentials.SecretAccessKey = string(mustGenerateSecretAccessKey())
config.Credentials.Region = "us-east-1" config.Credentials.Region = "us-east-1"
if err := saveConfig(config); err != nil { if err = saveConfig(config); err != nil {
return nil, err.Trace() return nil, err.Trace()
} }
return config, nil return config, nil

Loading…
Cancel
Save