Add db health checking back to /health. Allow POSTGRES_URI to override DATABASE_URL (#149)

Author: neufeldtech

main.go

@@ -18,6 +18,16 @@ import (
 	"gorm.io/gorm"
 )
 
+func init() {
+
+	if pgUri, exists := os.LookupEnv("POSTGRES_URI"); exists && pgUri != "" {
+		fmt.Println("WARN: Using POSTGRES_URI environment variable to override DATABASE_URL")
+		os.Setenv("DATABASE_URL", pgUri)
+		fmt.Println("Using DATABASE_URL:", os.Getenv("DATABASE_URL"))
+	}
+
+}
+
 var (
 	defaultPort                 int64 = 8080
 	slackSigningSecretConfigKey       = "slackSigningSecret"
@@ -35,7 +45,7 @@ var (
 		slackCallbackURLConfigKey:   os.Getenv("SLACK_CALLBACK_URL"),
 		legacyCryptoKeyConfigKey:    os.Getenv("CRYPTO_KEY"),
 		appURLConfigKey:             os.Getenv("APP_URL"),
-		databaseURL:                 os.Getenv("DATABASE_URL"),
+		databaseURL:                 os.Getenv("DATABASE_URL"), // if POSTGRES_URI is set, it will override DATABASE_URL
 	}
 )
 

pkg/secretmessage/handle_health.go

@@ -5,28 +5,26 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )
 
 func (ctl *PublicController) HandleHealth(c *gin.Context) {
 	version, ok := os.LookupEnv("NF_DEPLOYMENT_SHA")
 	if !ok {
 		version = "dev"
 	}
+	db, err := ctl.db.DB()
+	if err != nil {
+		ctl.logger.Error("error retrieving database connection", zap.Error(err))
+		c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"status": "DOWN", "sha": version})
+		return
+	}
 
-	// Neon removed their free tier. It now costs me money to keep the database up, so let it sleep to save costs.
-
-	// db, err := ctl.db.DB()
-	// if err != nil {
-	// 	log.Error(err)
-	// 	c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"status": "DOWN", "sha": version})
-	// 	return
-	// }
-
-	// err = db.PingContext(c.Request.Context())
-	// if err != nil {
-	// 	log.Error(err)
-	// 	c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"status": "DOWN", "sha": version})
-	// 	return
-	// }
+	err = db.PingContext(c.Request.Context())
+	if err != nil {
+		ctl.logger.Error("error pinging database", zap.Error(err))
+		c.AbortWithStatusJSON(http.StatusServiceUnavailable, gin.H{"status": "DOWN", "sha": version})
+		return
+	}
 	c.JSON(http.StatusOK, gin.H{"status": "UP", "sha": version})
 }