wpetit
/
super-graph
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix CloudRun connection issue

This commit is contained in:
Vikram Rangnekar 2020-04-12 10:09:37 -04:00
parent 41ea6ef6f5
commit ef50c1957b
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
cmd/internal/serv/init.go
View File

@ -2,11 +2,12 @@ package serv
import ( import (
"database/sql" "database/sql"
"fmt"
"path" "path"
"time" "time"
_ "github.com/jackc/pgx/v4/stdlib" "github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/stdlib"
//_ "github.com/jackc/pgx/v4/stdlib"
) )
func initConf() (*Config, error) { func initConf() (*Config, error) {
@ -82,63 +83,15 @@ func initDB(c *Config) (*sql.DB, error) {
var db *sql.DB var db *sql.DB
var err error var err error
cs := fmt.Sprintf("postgres://%s:%s@%s:%d/%s", // cs := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s",
c.DB.User, c.DB.Password, // c.DB.Host, c.DB.Port,
c.DB.Host, c.DB.Port, c.DB.DBName) // c.DB.User, c.DB.Password,
// c.DB.DBName)
for i := 1; i < 10; i++ { // fmt.Println(">>", cs)
db, err = sql.Open("pgx", cs)
if err == nil {
break
}
time.Sleep(time.Duration(i*100) * time.Millisecond)
}
if err != nil {
return nil, err
}
return db, nil
// config, _ := pgxpool.ParseConfig("")
// config.ConnConfig.Host = c.DB.Host
// config.ConnConfig.Port = c.DB.Port
// config.ConnConfig.Database = c.DB.DBName
// config.ConnConfig.User = c.DB.User
// config.ConnConfig.Password = c.DB.Password
// config.ConnConfig.RuntimeParams = map[string]string{
// "application_name": c.AppName,
// "search_path": c.DB.Schema,
// }
// switch c.LogLevel {
// case "debug":
// config.ConnConfig.LogLevel = pgx.LogLevelDebug
// case "info":
// config.ConnConfig.LogLevel = pgx.LogLevelInfo
// case "warn":
// config.ConnConfig.LogLevel = pgx.LogLevelWarn
// case "error":
// config.ConnConfig.LogLevel = pgx.LogLevelError
// default:
// config.ConnConfig.LogLevel = pgx.LogLevelNone
// }
// config.ConnConfig.Logger = NewSQLLogger(logger)
// // if c.DB.MaxRetries != 0 {
// // opt.MaxRetries = c.DB.MaxRetries
// // }
// if c.DB.PoolSize != 0 {
// config.MaxConns = conf.DB.PoolSize
// }
// var db *pgxpool.Pool
// var err error
// for i := 1; i < 10; i++ { // for i := 1; i < 10; i++ {
// db, err = pgxpool.ConnectConfig(context.Background(), config) // db, err = sql.Open("pgx", cs)
// if err == nil { // if err == nil {
// break // break
// } // }
@ -150,4 +103,52 @@ func initDB(c *Config) (*sql.DB, error) {
// } // }
// return db, nil // return db, nil
config, _ := pgx.ParseConfig("")
config.Host = c.DB.Host
config.Port = c.DB.Port
config.Database = c.DB.DBName
config.User = c.DB.User
config.Password = c.DB.Password
config.RuntimeParams = map[string]string{
"application_name": c.AppName,
"search_path": c.DB.Schema,
}
// switch c.LogLevel {
// case "debug":
// config.LogLevel = pgx.LogLevelDebug
// case "info":
// config.LogLevel = pgx.LogLevelInfo
// case "warn":
// config.LogLevel = pgx.LogLevelWarn
// case "error":
// config.LogLevel = pgx.LogLevelError
// default:
// config.LogLevel = pgx.LogLevelNone
// }
//config.Logger = NewSQLLogger(logger)
// if c.DB.MaxRetries != 0 {
// opt.MaxRetries = c.DB.MaxRetries
// }
// if c.DB.PoolSize != 0 {
// config.MaxConns = conf.DB.PoolSize
// }
for i := 1; i < 10; i++ {
db = stdlib.OpenDB(*config)
if db == nil {
break
}
time.Sleep(time.Duration(i*100) * time.Millisecond)
}
if err != nil {
return nil, err
}
return db, nil
} }