compose-postgres.yaml

@@ -1,4 +1,3 @@
-
 services:
   postgres:
     image: postgres
@@ -36,4 +35,4 @@ secrets:
 networks:
   database:
     name: database
-
+    external: true

kontor-echo/cmd/kontor/main.go

@@ -4,18 +4,18 @@ import (
 	"kontor-api-echo/pkg/handler"
 	"kontor-api-echo/pkg/schema"
 	"log"
+	"os"
 
-	// jwtware "github.com/gofiber/contrib/jwt"
-	// "github.com/gofiber/fiber/v2/middleware/logger"
 	echojwt "github.com/labstack/echo-jwt/v4"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )
 
 func main() {
+	log.SetOutput(os.Stdout)
 	log.Println("Kontor started")
 
-	if err := schema.Connect(); err != nil {
+	if _, err := schema.GetDatabase(); err != nil {
 		log.Fatal(err)
 	}
 
@@ -23,28 +23,17 @@ func main() {
 	e.GET("/health", handler.GetHealth)
 	e.POST("/login", handler.Login)
 
-	// skipper := func(c echo.Context) bool {
-	// 	// Skip health check endpoint
-	// 	return c.Request().URL.Path == "/health"
-	// }
-	// e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-	// 	LogStatus: true,
-	// 	LogURI:    true,
-	// 	Skipper:   skipper,
-	// 	BeforeNextFunc: func(c echo.Context) {
-	// 		c.Set("customValueFromContext", 42)
-	// 	},
-	// 	LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-	// 		value, _ := c.Get("customValueFromContext").(int)
-	// 		log.Printf("REQUEST: uri: %v, status: %v, custom-value: %v\n", v.URI, v.Status, value)
-	// 		return nil
-	// 	},
-	// }))
+	skipper := func(c echo.Context) bool {
+		// Skip health check endpoint
+		return c.Request().URL.Path == "/health"
+	}
+
 	e.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
 		LogStatus:   true,
 		LogURI:      true,
 		LogError:    true,
 		HandleError: true,
+		Skipper:     skipper,
 		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
 			if v.Error == nil {
 				log.Printf("REQUEST: uri: %v, status: %v\n", v.URI, v.Status)
@@ -56,20 +45,6 @@ func main() {
 	}))
 
 	group := e.Group("/api")
-	group.Use(middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
-		LogStatus:   true,
-		LogURI:      true,
-		LogError:    true,
-		HandleError: true,
-		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-			if v.Error == nil {
-				log.Printf("REQUEST: uri: %v, status: %v\n", v.URI, v.Status)
-			} else {
-				log.Printf("REQUEST-ERROR: uri: %v, status: %v, err: %v\n", v.URI, v.Status, v.Error.Error())
-			}
-			return nil
-		},
-	}))
 	group.Use(echojwt.WithConfig(echojwt.Config{SigningKey: []byte("secret")}))
 	handler.SetupComicRoutes(group)
 	handler.SetupMediaRoutes(group)

kontor-echo/pkg/schema/database.go

@@ -11,25 +11,6 @@ import (
 
 var DB *bun.DB
 
-func Connect() error {
-	var err error
-
-	dsn := "postgres://kontor:kontor@postgres:5432/kontor?sslmode=disable"
-	sqldb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
-
-	sqldb.SetMaxOpenConns(4)
-	sqldb.SetMaxIdleConns(4)
-
-	DB := bun.NewDB(sqldb, pgdialect.New())
-
-	if err = DB.Ping(); err != nil {
-		return err
-	}
-
-	log.Println("Connection Opened to Database")
-	return nil
-}
-
 func GetDatabase() (*bun.DB, error) {
 	var err error