eth: gracefully error if database cannot be opened

karalabe · karalabe · commit d40179f882f0 · 2017-06-23T10:12:41.000+03:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,13 @@ func makeExtraData(extra []byte) []byte {`
`200`	`200`	`// CreateDB creates the chain database.`
`201`	`201`	`func CreateDB(ctx node.ServiceContext, config Config, name string) (ethdb.Database, error) {`
`202`	`202`	`db, err := ctx.OpenDatabase(name, config.DatabaseCache, config.DatabaseHandles)`
	`203`	`+ if err != nil {`
	`204`	`+ return nil, err`
	`205`	`+ }`
`203`	`206`	`if db, ok := db.(*ethdb.LDBDatabase); ok {`
`204`	`207`	`db.Meter("eth/db/chaindata/")`
`205`	`208`	`}`
`206`		`- return db, err`
	`209`	`+ return db, nil`
`207`	`210`	`}`
`208`	`211`
`209`	`212`	`// CreateConsensusEngine creates the required type of consensus engine instance for an Ethereum service`