From 3e5d6d1f310e76dab4ae32998fdcd5d4e0834885 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 18 Apr 2016 20:57:45 -0700 Subject: [PATCH] review from Hukeping Signed-off-by: David Lawrence (github: endophage) --- cmd/notary-server/config.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/notary-server/config.go b/cmd/notary-server/config.go index f25288acdc..61e9d5f722 100644 --- a/cmd/notary-server/config.go +++ b/cmd/notary-server/config.go @@ -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 }