Reduced duplicate code for config reading.

1 files changed, 5 insertions, 10 deletions

diff --git a/db.go b/db.go
index ccddd00..2f9abf2 100644
--- a/db.go
+++ b/db.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"kch42.de/gostuff/mailremind/confhelper"
 	"kch42.de/gostuff/mailremind/model"
 	"log"
 )
@@ -9,21 +10,15 @@ var db model.DBInfo
 var dbcon model.DBCon
 
 func initDB() {
-	dbdrv, err := conf.GetString("db", "driver")
-	if err != nil {
-		log.Fatalf("Could not get db.driver from config: %s", err)
-	}
-
-	dbconf, err := conf.GetString("db", "conf")
-	if err != nil {
-		log.Fatalf("Could not get db.conf from config: %s", err)
-	}
+	dbdrv := confhelper.ConfStringOrFatal(conf, "db", "driver")
+	dbconf := confhelper.ConfStringOrFatal(conf, "db", "conf")
 
 	var ok bool
 	if db, ok = model.GetDBInfo(dbdrv); !ok {
-		log.Fatalf("Could not get info for dbdrv %s: %s", dbdrv, err)
+		log.Fatalf("Could not get info for dbdrv %s", dbdrv)
 	}
 
+	var err error
 	if dbcon, err = db.Connect(dbconf); err != nil {
 		log.Fatalf("Unable to connect to %s database: %s", dbdrv, err)
 	}