Merge pull request #2 from cuappdev/deployment-fix

Fixing crashes

Author: JoshD94

docker-compose.yml

@@ -6,10 +6,4 @@ services:
     env_file: .env
     ports:
       - "8080:8080"
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/health || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
+    restart: unless-stopped

main.go

@@ -1,20 +1,23 @@
 package main
 
 import (
+	"log"
 	"github.com/gin-gonic/gin"
 
   	"github.com/cuappdev/hustle-backend/models"
   	"github.com/cuappdev/hustle-backend/controllers"
 )
 
 func main() {
+	log.Println("Starting hustle-backend...")
   	r := gin.Default()
-
+	log.Println("Connecting to database...")
 	models.ConnectDatabase()
+	log.Println("Setting up routes...")
 	r.GET("/healthcheck", controllers.HealthCheck)
 	r.GET("/users", controllers.FindUsers)
 	r.POST("/users", controllers.CreateUser)
-
+    log.Println("Server starting on :8080")
   	r.Run()
 }
 

models/setup.go

@@ -23,12 +23,12 @@ func ConnectDatabase() {
 
     database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
     if err != nil {
-        panic("Failed to connect to database!")
+        return err
     }
 
     sqlDB, err := database.DB()
     if err != nil {
-        panic("Failed to get underlying sql.DB")
+        return err
     }
 
     sqlDB.SetMaxIdleConns(10)
@@ -39,7 +39,7 @@ func ConnectDatabase() {
     err = database.AutoMigrate(&User{})
     if err != nil {
         log.Printf("Failed to migrate database: %v", err)
-        panic("Database migration failed!")
+        return err
     }
 
     DB = database