docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

review from Hukeping 

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2016-04-18 20:57:45 -07:00
parent db2e625341
commit 3e5d6d1f31
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/notary-server/config.go
View File

@ -77,13 +77,12 @@ func getStore(configuration *viper.Viper, hRegister healthRegister) (
if err != nil {
return nil, err
}
var s *storage.SQLStorage
s, err = storage.NewSQLStorage(storeConfig.Backend, storeConfig.Source)
s, err := storage.NewSQLStorage(storeConfig.Backend, storeConfig.Source)
if err != nil {
return nil, fmt.Errorf("Error starting %s driver: %s", backend, err.Error())
}
store = *storage.NewTUFMetaStorage(s)
hRegister("DB operational", s.CheckHealth, time.Second*60)
hRegister("DB operational", s.CheckHealth, time.Minute)
case notary.RethinkDBBackend:
var sess *gorethink.Session
storeConfig, err := utils.ParseRethinkDBStorage(configuration)
@ -96,9 +95,9 @@ func getStore(configuration *viper.Viper, hRegister healthRegister) (
}
s := storage.NewRethinkDBStorage(storeConfig.DBName, sess)
store = *storage.NewTUFMetaStorage(s)
hRegister("DB operational", s.CheckHealth, time.Second*60)
hRegister("DB operational", s.CheckHealth, time.Minute)
default:
return nil, fmt.Errorf("%s not a supported storage backend", backend)
return nil, fmt.Errorf("%s is not a supported storage backend", backend)
}
return store, nil
}