Refactor link repository and improve logging

database/database.go

@@ -6,16 +6,34 @@ import (
 	"fmt"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/knadh/koanf"
+	"github.com/rs/zerolog/log"
+	"time"
 )
 
-func Pool(config *koanf.Koanf) *pgxpool.Pool {
-	connStr, err := getConnectionString(config)
-	if err != nil {
+func InitPool(config *koanf.Koanf) *pgxpool.Pool {
+	pool := NewPool(config)
+
+	if err := runMigrations(pool); err != nil {
+		log.Fatal().Err(err).Msg("Couldn't apply migrations")
 		panic(err)
 	}
 
-	pool, err := pgxpool.Connect(context.Background(), connStr)
+	return pool
+}
+
+func NewPool(config *koanf.Koanf) *pgxpool.Pool {
+	connStr, err := getConnectionString(config)
 	if err != nil {
+		log.Fatal().Err(err).Msg("Couldn't construct DB connection string")
+		panic(err)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	pool, err := pgxpool.Connect(ctx, connStr)
+	if err != nil {
+		log.Fatal().Err(err).Msg("Couldn't connect to DB")
 		panic(err)
 	}
 

database/migrate.go

@@ -4,24 +4,30 @@ import (
 	"context"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/jackc/tern/migrate"
+	"time"
 )
 
-func Migrate(pool *pgxpool.Pool) {
-	conn, err := pool.Acquire(context.Background())
+func runMigrations(pool *pgxpool.Pool) (err error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	conn, err := pool.Acquire(ctx)
 	if err != nil {
-		panic(err)
+		return
 	}
 
-	migrator, err := migrate.NewMigrator(context.Background(), conn.Conn(), "schema_version")
+	migrator, err := migrate.NewMigrator(ctx, conn.Conn(), "schema_version")
 	if err != nil {
-		panic(err)
+		return
 	}
 
 	if err = migrator.LoadMigrations("./migrations"); err != nil {
-		panic(err)
+		return
 	}
 
-	if err = migrator.Migrate(context.Background()); err != nil {
-		panic(err)
+	if err = migrator.Migrate(ctx); err != nil {
+		return
 	}
+
+	return
 }

database/util.go

@@ -0,0 +1,15 @@
+package database
+
+import (
+	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/rs/zerolog/log"
+)
+
+func LogPoolState(pool *pgxpool.Pool, message string) {
+	stat := pool.Stat()
+	log.Info().
+		Int32("acquired_conns", stat.AcquiredConns()).
+		Int32("idle_conns", stat.IdleConns()).
+		Int32("total_conns", stat.TotalConns()).
+		Msg(message)
+}