go/starter
1
0
Fork 0
mirror of https://github.com/ManyakRus/starter.git synced 2025-11-24 22:53:52 +02:00
Code Issues Releases Activity

сделал postgres_pgxpool

Browse Source
This commit is contained in:
Nikitin Aleksandr
2025-05-28 14:56:14 +03:00
parent 5a1ebf303d
commit 55d1fd11d9
4 changed files with 746 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
postgres_pgx/postgres_pgx.go
View File

@@ -6,6 +6,7 @@ import (
"context"
"errors"
"fmt"
"github.com/ManyakRus/starter/constants"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/port_checker"
"github.com/jackc/pgx/v5"
@@ -141,7 +142,7 @@ func GetConnectionString(ApplicationName string) string {
dsn += "user=" + Settings.DB_USER + " "
dsn += "password=" + Settings.DB_PASSWORD + " "
dsn += "dbname=" + Settings.DB_NAME + " "
dsn += "port=" + Settings.DB_PORT + " sslmode=disable TimeZone=UTC "
dsn += "port=" + Settings.DB_PORT + " sslmode=disable TimeZone=" + constants.TIME_ZONE + " "
dsn += "application_name=" + ApplicationName
return dsn
@@ -380,31 +381,31 @@ loop:
break loop
case <-ticker.C:
//ping в базе данных
mutex_Connect.RLock() //race
//err = GetConnection().Ping(ctx) //ping делать нельзя т.к. data race
err = Ping_err(ctx)
mutex_Connect.RUnlock()
if err != nil {
switch err.Error() {
case TextConnBusy:
{
log.Warn("postgres_pgx Ping() warning: ", err)
}
default:
{
NeedReconnect = true
log.Error("postgres_pgx Ping() error: ", err)
}
}
} else {
//IsClosed
if GetConnection().IsClosed() == true {
NeedReconnect = true
log.Error("postgres_pgx error: IsClosed() = true")
}
}
////ping в базе данных
//mutex_Connect.RLock() //race
////err = GetConnection().Ping(ctx) //ping делать нельзя т.к. data race
//err = Ping_err(ctx)
//mutex_Connect.RUnlock()
//if err != nil {
// switch err.Error() {
// case TextConnBusy:
// {
// log.Warn("postgres_pgx Ping() warning: ", err)
// }
// default:
// {
// NeedReconnect = true
// log.Error("postgres_pgx Ping() error: ", err)
// }
// }
//
//} else {
// //IsClosed
// if GetConnection().IsClosed() == true {
// NeedReconnect = true
// log.Error("postgres_pgx error: IsClosed() = true")
// }
//}
//ping порта
err = port_checker.CheckPort_err(Settings.DB_HOST, Settings.DB_PORT)
@@ -447,7 +448,8 @@ func GetConnection() *pgx.Conn {
// GetConnection_WithApplicationName - возвращает соединение к нужной базе данных, с указанием имени приложения
func GetConnection_WithApplicationName(ApplicationName string) *pgx.Conn {
if Conn == nil {
Connect_WithApplicationName_err(ApplicationName)
err := Connect_WithApplicationName_err(ApplicationName)
LogInfo_Connected(err)
}
return Conn

7
postgres_pgx/postgres_pgx_test.go
View File

@@ -2,6 +2,7 @@ package postgres_pgx
import (
"errors"
"golang.org/x/net/context"
"testing"
"time"
@@ -130,7 +131,11 @@ select 1;
SELECT * FROM temp_TestRawMultipleSQL2
`
//TextSQL := "SELECT 1; SELECT 2"
Rows, err := RawMultipleSQL(Conn, TextSQL)
ctx := context.Background()
tx, err := Conn.Begin(ctx)
defer tx.Commit(ctx)
Rows, err := RawMultipleSQL(tx, TextSQL)
defer Rows.Close()
if err != nil {
t.Error("TestRawMultipleSQL() error: ", err)
return