code review refactor

hashicorp · Sep 24, 2019 · e502d0e · e502d0e
1 parent d771003
commit e502d0e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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)
 	}