diff --git a/pkg/version/version.txt b/pkg/version/version.txt index 881ef353..03b2be49 100644 --- a/pkg/version/version.txt +++ b/pkg/version/version.txt @@ -1 +1 @@ -v1.0.95 2024-12-06 11:25:59 +0300 +v1.0.112 2025-01-24 14:27:09 +0300 diff --git a/postgres_connect/postgres_connect.go b/postgres_connect/postgres_connect.go index e5b5c82f..197597f1 100644 --- a/postgres_connect/postgres_connect.go +++ b/postgres_connect/postgres_connect.go @@ -320,7 +320,11 @@ loop: } else if NeedReconnect == true { log.Warn("postgres_connect CheckPort(", addr, ") OK. Start Reconnect()") NeedReconnect = false - Connect() + err = Connect_err() + if err != nil { + NeedReconnect = true + log.Error("Connect_err() error: ", err) + } } } } diff --git a/postgres_pgx/postgres_pgx.go b/postgres_pgx/postgres_pgx.go index 47fec98c..75b5057e 100644 --- a/postgres_pgx/postgres_pgx.go +++ b/postgres_pgx/postgres_pgx.go @@ -6,7 +6,7 @@ import ( "context" "errors" "fmt" - "github.com/ManyakRus/starter/logger" + "github.com/ManyakRus/starter/log" "github.com/ManyakRus/starter/port_checker" "github.com/jackc/pgx/v5" "strings" @@ -31,9 +31,6 @@ import ( // Conn - соединение к базе данных var Conn *pgx.Conn -// log - глобальный логгер -var log = logger.GetLog() - // mutexReconnect - защита от многопоточности Reconnect() var mutexReconnect = &sync.Mutex{} @@ -367,7 +364,11 @@ loop: } else if NeedReconnect == true { log.Warn("postgres_pgx CheckPort(", addr, ") OK. Start Reconnect()") NeedReconnect = false - Connect() + err = Connect_err() + if err != nil { + NeedReconnect = true + log.Error("Connect_err() error: ", err) + } } } } diff --git a/postgres_stek/postgres_stek.go b/postgres_stek/postgres_stek.go index 80e4f609..e3b7fcd3 100644 --- a/postgres_stek/postgres_stek.go +++ b/postgres_stek/postgres_stek.go @@ -370,7 +370,11 @@ loop: } else if NeedReconnect == true { log.Warn("postgres_stek CheckPort(", addr, ") OK. Start Reconnect()") NeedReconnect = false - Connect(Connection) + err = Connect_err(Connection) + if err != nil { + NeedReconnect = true + log.Error("Connect_err() error: ", err) + } } } }