improve error handling

Signed-off-by: Johan Haals <[email protected]>

cmd/yopass-server/main.go

@@ -48,7 +48,10 @@ func init() {
 
 func main() {
 	logger := configureZapLogger()
-	db := setupDatabase(logger)
+	db, err := setupDatabase(logger)
+	if err != nil {
+		logger.Fatal("failed to setup database", zap.Error(err))
+	}
 	registry := prometheus.NewRegistry()
 	registry.MustRegister(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}))
 	registry.MustRegister(collectors.NewGoCollector())
@@ -130,7 +133,7 @@ func configureZapLogger() *zap.Logger {
 	return logger
 }
 
-func setupDatabase(logger *zap.Logger) server.Database {
+func setupDatabase(logger *zap.Logger) (server.Database, error) {
 	var db server.Database
 	switch database := viper.GetString("database"); database {
 	case "memcached":
@@ -142,11 +145,11 @@ func setupDatabase(logger *zap.Logger) server.Database {
 		var err error
 		db, err = server.NewRedis(redis)
 		if err != nil {
-			logger.Fatal("invalid Redis URL", zap.Error(err))
+			return nil, fmt.Errorf("invalid Redis URL: %w", err)
 		}
 		logger.Debug("configured Redis", zap.String("url", redis))
 	default:
-		logger.Fatal("unsupported database, expected 'memcached' or 'redis'", zap.String("database", database))
+		return nil, fmt.Errorf("unsupported database, expected 'memcached' or 'redis' got '%s'", database)
 	}
-	return db
+	return db, nil
 }

cmd/yopass-server/main_test.go

@@ -16,7 +16,7 @@ func TestSetupDatabase(t *testing.T) {
 	core, logs := observer.New(zapcore.DebugLevel)
 	logger := zap.New(core)
 
-	db := setupDatabase(logger)
+	db, _ := setupDatabase(logger)
 	if db == nil {
 		t.Fatal("Expected non-nil database")
 	}
@@ -33,7 +33,7 @@ func TestSetupDatabaseRedis(t *testing.T) {
 	core, logs := observer.New(zapcore.DebugLevel)
 	logger := zap.New(core)
 
-	db := setupDatabase(logger)
+	db, _ := setupDatabase(logger)
 	if db == nil {
 		t.Fatal("Expected non-nil database")
 	}
@@ -43,20 +43,28 @@ func TestSetupDatabaseRedis(t *testing.T) {
 	}
 }
 
-func TestSetupDatabaseInvalid(t *testing.T) {
-	viper.Set("database", "invalid")
+func TestSetupDatabaseRedisWithInvalidUrl(t *testing.T) {
+	viper.Set("database", "redis")
+	viper.Set("redis", "boop")
 
-	core, logs := observer.New(zapcore.DebugLevel)
+	core, _ := observer.New(zapcore.DebugLevel)
 	logger := zap.New(core)
 
-	defer func() {
-		if r := recover(); r == nil {
-			t.Fatal("Expected panic for unsupported database")
-		}
-	}()
+	_, err := setupDatabase(logger)
+	expected := `invalid Redis URL: invalid redis URL scheme: `
+	if err.Error() != expected {
+		t.Fatalf("Expected '%s', got '%v'", expected, err.Error())
+	}
+}
+
+func TestSetupDatabaseInvalid(t *testing.T) {
+	viper.Set("database", "invalid")
+	core, _ := observer.New(zapcore.DebugLevel)
+	logger := zap.New(core)
 
-	setupDatabase(logger)
-	if logs.FilterMessage("unsupported database").Len() != 1 {
-		t.Error("Expected log message 'unsupported database'")
+	_, err := setupDatabase(logger)
+	expected := `unsupported database, expected 'memcached' or 'redis' got 'invalid'`
+	if err.Error() != expected {
+		t.Fatalf("Expected '%s', got '%v'", expected, err.Error())
 	}
 }