added CheckConnection for postgres

Author: sxwebdev

go.mod

@@ -3,17 +3,17 @@ module github.com/tkcrm/modules
 go 1.23.0
 
 require (
-	github.com/cristalhq/aconfig v0.18.6
+	github.com/cristalhq/aconfig v0.18.7
 	github.com/cristalhq/aconfig/aconfigdotenv v0.17.1
 	github.com/google/uuid v1.6.0
 	github.com/hibiken/asynq v0.25.1
-	github.com/jackc/pgx/v5 v5.7.2
-	github.com/nats-io/nats.go v1.39.1
-	github.com/redis/go-redis/v9 v9.7.1
+	github.com/jackc/pgx/v5 v5.7.5
+	github.com/nats-io/nats.go v1.43.0
+	github.com/redis/go-redis/v9 v9.9.0
 	github.com/stretchr/testify v1.10.0
 	github.com/uptrace/bun v1.2.11
 	go.uber.org/zap v1.27.0
-	golang.org/x/sync v0.12.0
+	golang.org/x/sync v0.14.0
 )
 
 require (
@@ -30,50 +30,53 @@ require (
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/oklog/ulid/v2 v2.1.0 // indirect
+	github.com/oklog/ulid/v2 v2.1.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.63.0 // indirect
-	github.com/prometheus/procfs v0.16.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.64.0 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/cast v1.9.2 // indirect
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
 	github.com/vgarvardt/backoff v1.0.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	mellium.im/sasl v0.3.2 // indirect
 )
 
 require (
-	github.com/getsentry/sentry-go v0.31.1
+	github.com/getsentry/sentry-go v0.33.0
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
 	github.com/gobeam/stringy v0.0.7
 	github.com/goccy/go-json v0.10.5
-	github.com/huandu/go-sqlbuilder v1.34.0
-	github.com/nats-io/nkeys v0.4.10 // indirect
+	github.com/huandu/go-sqlbuilder v1.35.0
+	github.com/nats-io/nkeys v0.4.11 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/prometheus/client_golang v1.21.1
-	github.com/taosdata/driver-go/v3 v3.5.8
+	github.com/prometheus/client_golang v1.22.0
+	github.com/taosdata/driver-go/v3 v3.7.0
 	github.com/ulule/limiter/v3 v3.11.2
 	github.com/uptrace/bun/dialect/pgdialect v1.2.11
 	github.com/uptrace/bun/driver/pgdriver v1.2.11
 	github.com/uptrace/bun/extra/bundebug v1.2.11
-	github.com/vgarvardt/gue/v5 v5.7.1
+	github.com/vgarvardt/gue/v5 v5.8.0
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	google.golang.org/protobuf v1.36.5
+	golang.org/x/crypto v0.38.0 // indirect
+	google.golang.org/protobuf v1.36.6
 )

go.sum

@@ -2,17 +2,20 @@ package postgres
 
 import (
 	"context"
+	"fmt"
+	"time"
 
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/tkcrm/modules/pkg/db/dbutils"
+	"github.com/tkcrm/modules/pkg/retry"
 )
 
 type PostgreSQL struct {
 	DB  *pgxpool.Pool
 	cfg Config
 }
 
-func New(ctx context.Context, cfg Config, logger logger) (*PostgreSQL, error) {
+func New(ctx context.Context, cfg Config) (*PostgreSQL, error) {
 	instance := &PostgreSQL{
 		cfg: cfg,
 	}
@@ -33,13 +36,20 @@ func New(ctx context.Context, cfg Config, logger logger) (*PostgreSQL, error) {
 		return nil, err
 	}
 
-	if err := pool.Ping(ctx); err != nil {
-		return nil, err
-	}
-
-	logger.Info("successfully connected to postgres")
-
 	instance.DB = pool
 
 	return instance, nil
 }
+
+// CheckConnection checks if the PostgreSQL connection pool is initialized and attempts to ping the database.
+// It retries the ping operation up to 5 times with a 2-second delay between attempts.
+// If the connection pool is not initialized, it returns an error.
+func (p *PostgreSQL) CheckConnection(ctx context.Context) error {
+	if p.DB == nil {
+		return fmt.Errorf("PostgreSQL connection pool is not initialized")
+	}
+
+	return retry.New(retry.WithDelay(time.Second*2), retry.WithMaxAttempts(5)).Do(func() error {
+		return p.DB.Ping(ctx)
+	})
+}

pkg/db/postgres/logger.go

@@ -0,0 +1,8 @@
+package retry
+
+import "errors"
+
+var (
+	ErrRetry = errors.New("retry")
+	ErrExit  = errors.New("exit")
+)

pkg/db/postgres/postgres.go

@@ -0,0 +1,67 @@
+package retry
+
+import (
+	"context"
+	"time"
+)
+
+type Option func(*Retry)
+
+// WithMaxAttempts sets the maximum number of attempts
+func WithMaxAttempts(maxAttempts int) Option {
+	return func(r *Retry) {
+		r.maxAttempts = maxAttempts
+	}
+}
+
+// WithPolicy sets the retry policy
+func WithPolicy(policy Policy) Option {
+	return func(r *Retry) {
+		r.policy = policy
+	}
+}
+
+// WithDelay sets the delay between retries
+func WithDelay(delay time.Duration) Option {
+	return func(r *Retry) {
+		r.delay = delay
+	}
+}
+
+// WithDebug sets the debug mode
+func WithDebug(debug bool) Option {
+	return func(r *Retry) {
+		r.debug = debug
+	}
+}
+
+// WithContext sets the ctx for Infinite policy retry
+func WithContext(ctx context.Context) Option {
+	return func(r *Retry) {
+		r.ctx = ctx
+	}
+}
+
+// SetMaxAttempts sets the maximum number of attempts
+func (r *Retry) SetMaxAttempts(maxAttempts int) *Retry {
+	r.maxAttempts = maxAttempts
+	return r
+}
+
+// SetPolicy sets the retry policy
+func (r *Retry) SetPolicy(policy Policy) *Retry {
+	r.policy = policy
+	return r
+}
+
+// SetDelay sets the delay between retries
+func (r *Retry) SetDelay(delay time.Duration) *Retry {
+	r.delay = delay
+	return r
+}
+
+// SetDebug sets the debug mode
+func (r *Retry) SetDebug(debug bool) *Retry {
+	r.debug = debug
+	return r
+}

pkg/retry/errors.go

@@ -0,0 +1,21 @@
+package retry
+
+import "fmt"
+
+type Policy int
+
+const (
+	PolicyLinear Policy = iota
+	PolicyBackoff
+	PolicyInfinite
+)
+
+// Validate validates the retry policy
+func (r Policy) Validate() error {
+	switch r {
+	case PolicyLinear, PolicyBackoff, PolicyInfinite:
+		return nil
+	default:
+		return fmt.Errorf("invalid retry policy")
+	}
+}

pkg/retry/options.go

@@ -0,0 +1,129 @@
+package retry
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+)
+
+// Retry represents a retry mechanism
+type Retry struct {
+	ctx         context.Context
+	maxAttempts int
+	policy      Policy
+	delay       time.Duration
+	debug       bool
+}
+
+// New creates a new Retry instance
+//
+// maxAttempts: the maximum number of attempts. Default is 5
+//
+// policy: the retry policy. Default is PolicyBackoff
+func New(opts ...Option) *Retry {
+	r := &Retry{
+		maxAttempts: 5,
+		policy:      PolicyBackoff,
+		delay:       1 * time.Second,
+	}
+
+	for _, opt := range opts {
+		opt(r)
+	}
+
+	return r
+}
+
+// Do - performs the retry mechanism
+func (r *Retry) Do(fn func() error) error {
+	switch r.policy {
+	case PolicyLinear:
+		return r.linearRetry(fn)
+	case PolicyBackoff:
+		return r.backoffRetry(fn)
+	case PolicyInfinite:
+		return r.infiniteRetry(fn)
+	default:
+		return fmt.Errorf("unsupported retry policy")
+	}
+}
+
+// linearRetry - performs a linear retry mechanism
+func (r *Retry) linearRetry(fn func() error) error {
+	for attempt := 1; attempt <= r.maxAttempts; attempt++ {
+		err := fn()
+		if err == nil {
+			return nil
+		}
+
+		if errors.Is(err, ErrExit) {
+			return err
+		}
+
+		if attempt < r.maxAttempts {
+			if r.debug {
+				fmt.Printf("linear Retry attempt %d failed, retrying in %s...\n", attempt, r.delay)
+			}
+			time.Sleep(r.delay)
+		}
+	}
+	return fmt.Errorf("linear retry failed after %d attempts", r.maxAttempts)
+}
+
+// backoffRetry - performs a backoff retry mechanism
+func (r *Retry) backoffRetry(fn func() error) error {
+	for attempt := 1; attempt <= r.maxAttempts; attempt++ {
+		err := fn()
+		if err == nil {
+			return nil
+		}
+
+		if errors.Is(err, ErrExit) {
+			return err
+		}
+
+		if attempt < r.maxAttempts {
+			delay := r.delay * (1 << (attempt - 1)) // Увеличение задержки в 2 раза на каждую попытку
+			if r.debug {
+				fmt.Printf("backoff Retry attempt %d failed, retrying in %s...\n", attempt, delay)
+			}
+			time.Sleep(delay)
+		}
+	}
+	return fmt.Errorf("backoff retry failed after %d attempts", r.maxAttempts)
+}
+
+func (r *Retry) infiniteRetry(fn func() error) error {
+	if r.ctx == nil {
+		return fmt.Errorf("infinite retry cannot be initialized without ctx")
+	}
+
+	resCh := make(chan error, 1)
+	go func() {
+		defer close(resCh)
+		for {
+			select {
+			case <-r.ctx.Done():
+				return
+			default:
+				err := fn()
+				if err == nil {
+					return
+				}
+
+				if errors.Is(err, ErrExit) {
+					resCh <- err
+					return
+				}
+
+				if r.debug {
+					fmt.Printf("initnite retry attempt\n")
+				}
+				time.Sleep(r.delay)
+			}
+		}
+	}()
+
+	return <-resCh
+}