From 8e4edf31c7c5de51b8d405e838f04300d9414364 Mon Sep 17 00:00:00 2001 From: Atridad Lahiji Date: Wed, 16 Oct 2024 21:14:19 -0600 Subject: [PATCH] Whoops --- lib/db.go | 5 +++-- main.go | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/db.go b/lib/db.go index 31c7e2e..5296754 100644 --- a/lib/db.go +++ b/lib/db.go @@ -27,9 +27,10 @@ func GenerateNewID(prefix string) string { } // Initializes the global database connection pool. -func InitializeDBPool(databaseURL string) error { +func InitializeDBPool(host, user, password, dbname string, port int) error { + connString := fmt.Sprintf("postgres://%s:%s@%s:%d/%s", user, password, host, port, dbname) var err error - dbPool, err = pgxpool.Connect(context.Background(), databaseURL) + dbPool, err = pgxpool.Connect(context.Background(), connString) if err != nil { return err } diff --git a/main.go b/main.go index 4e1be39..8763e27 100755 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( "log" "net/http" "os" + "strconv" "pollo/api" "pollo/api/webhooks" @@ -26,12 +27,21 @@ func main() { godotenv.Load(".env") // Initialize the database connection pool - databaseURL := os.Getenv("DATABASE_URL") - if databaseURL == "" { - log.Fatal("DATABASE_URL environment variable not set") + postgresHost := os.Getenv("POSTGRES_HOST") + postgresPort := os.Getenv("POSTGRES_PORT") + postgresUser := os.Getenv("POSTGRES_USER") + postgresPassword := os.Getenv("POSTGRES_PASSWORD") + postgresDB := os.Getenv("POSTGRES_DB") + if postgresHost == "" || postgresPort == "" || postgresUser == "" || postgresPassword == "" || postgresDB == "" { + log.Fatal("DB environment variables not set") } - if err := lib.InitializeDBPool(databaseURL); err != nil { + portNumber, err := strconv.Atoi(postgresPort) + if err != nil { + log.Fatalf("Invalid database port: %v", err) + } + + if err := lib.InitializeDBPool(postgresHost, postgresUser, postgresPassword, postgresDB, portNumber); err != nil { log.Fatalf("Failed to initialize DB pool: %v", err) }