From d40179f882f00e8c8c992ebc5b0bed937090e90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 23 Jun 2017 10:12:41 +0300 Subject: [PATCH] eth: gracefully error if database cannot be opened --- eth/backend.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eth/backend.go b/eth/backend.go index be2d032832..75e0e737b1 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -200,10 +200,13 @@ func makeExtraData(extra []byte) []byte { // CreateDB creates the chain database. func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Database, error) { db, err := ctx.OpenDatabase(name, config.DatabaseCache, config.DatabaseHandles) + if err != nil { + return nil, err + } if db, ok := db.(*ethdb.LDBDatabase); ok { db.Meter("eth/db/chaindata/") } - return db, err + return db, nil } // CreateConsensusEngine creates the required type of consensus engine instance for an Ethereum service