From e502d0e22220ed935b34f452e721271a86560a8e Mon Sep 17 00:00:00 2001 From: Jasmine Dahilig Date: Tue, 24 Sep 2019 15:20:16 -0700 Subject: [PATCH] code review refactor --- client/state/state_database.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/state/state_database.go b/client/state/state_database.go index 86106241c57a..d6784e98ee53 100644 --- a/client/state/state_database.go +++ b/client/state/state_database.go @@ -127,10 +127,9 @@ func NewBoltStateDB(logger hclog.Logger, stateDir string) (StateDB, error) { // Create or open the boltdb state database db, err := boltdd.Open(fn, 0600, timeout) - if err != nil { - if err == bolt.ErrTimeout { - return nil, fmt.Errorf("timed out while opening database, is another Nomad process accessing data_dir %s?", stateDir) - } + if err == bolt.ErrTimeout { + return nil, fmt.Errorf("timed out while opening database, is another Nomad process accessing data_dir %s?", stateDir) + } else if err != nil { return nil, fmt.Errorf("failed to create state database: %v", err) }