ntppool/data-api
Private
Public Access
1
0
Fork 0
Code Activity

db: less logging when opening a database connection
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Ask Bjørn Hansen
2025-01-06 19:31:19 +01:00
parent 3a9879b793
commit e316aeee99
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chdb/db.go
View File

@@ -40,7 +40,7 @@ func New(ctx context.Context, dbConfigPath string) (*ClickHouse, error) {
func setupClickhouse(ctx context.Context, configFile string) (*ClickHouse, error) { func setupClickhouse(ctx context.Context, configFile string) (*ClickHouse, error) {
log := logger.FromContext(ctx) log := logger.FromContext(ctx)
log.InfoContext(ctx, "opening config", "file", configFile) log.DebugContext(ctx, "opening ch config", "file", configFile)
dbFile, err := os.Open(configFile) dbFile, err := os.Open(configFile)
if err != nil { if err != nil {

8
ntpdb/dbconn.go
View File

@@ -5,7 +5,6 @@ import (
"database/sql" "database/sql"
"database/sql/driver" "database/sql/driver"
"fmt" "fmt"
"log"
"os" "os"
"time" "time"
@@ -27,7 +26,7 @@ type DBConfig struct {
func OpenDB(ctx context.Context, configFile string) (*sql.DB, error) { func OpenDB(ctx context.Context, configFile string) (*sql.DB, error) {
log := logger.FromContext(ctx) log := logger.FromContext(ctx)
dbconn := sql.OpenDB(Driver{CreateConnectorFunc: createConnector(configFile)}) dbconn := sql.OpenDB(Driver{CreateConnectorFunc: createConnector(ctx, configFile)})
dbconn.SetConnMaxLifetime(time.Minute * 3) dbconn.SetConnMaxLifetime(time.Minute * 3)
dbconn.SetMaxOpenConns(8) dbconn.SetMaxOpenConns(8)
@@ -42,9 +41,10 @@ func OpenDB(ctx context.Context, configFile string) (*sql.DB, error) {
return dbconn, nil return dbconn, nil
} }
func createConnector(configFile string) CreateConnectorFunc { func createConnector(ctx context.Context, configFile string) CreateConnectorFunc {
log := logger.FromContext(ctx)
return func() (driver.Connector, error) { return func() (driver.Connector, error) {
log.Printf("opening config file %s", configFile) log.DebugContext(ctx, "opening db config file", "filename", configFile)
dbFile, err := os.Open(configFile) dbFile, err := os.Open(configFile)
if err != nil { if err != nil {