root
/
telebit
mirror of https://github.com/therootcompany/telebit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix: complete renaming of pgURL to dbURL

This commit is contained in:
AJ ONeal 2021-11-02 01:50:43 -06:00
parent c2a5b0b525
commit 79231a6de8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/mgmt/authstore/postgresql.go
View File

@ -23,13 +23,13 @@ func NewStore(dbURL, initSQL string) (Store, error) {
// TODO url.Parse // TODO url.Parse
if !strings.Contains(dbURL, "sslmode=") { if !strings.Contains(dbURL, "sslmode=") {
sep := "?" sep := "?"
if strings.Contains(connStr, sep) { if strings.Contains(dbURL, sep) {
sep = "&" sep = "&"
} }
if strings.Contains(connStr, "@localhost/") || strings.Contains(connStr, "@localhost:") { if strings.Contains(dbURL, "@localhost/") || strings.Contains(dbURL, "@localhost:") {
connStr += sep + "sslmode=disable" dbURL += sep + "sslmode=disable"
} else { } else {
connStr += sep + "sslmode=required" dbURL += sep + "sslmode=required"
} }
} }
@ -46,7 +46,7 @@ func NewStore(dbURL, initSQL string) (Store, error) {
ctx, done := context.WithDeadline(context.Background(), time.Now().Add(5*time.Second)) ctx, done := context.WithDeadline(context.Background(), time.Now().Add(5*time.Second))
defer done() defer done()
db, err := sql.Open(dbtype, pgURL) db, err := sql.Open(dbtype, dbURL)
if err := db.PingContext(ctx); nil != err { if err := db.PingContext(ctx); nil != err {
return nil, err return nil, err
} }