zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2023-08-27 21:23:03 +08:00
parent f31ef1649f
commit 0bf689fa8d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/datastore/datastore_container.go
+3 -6
View File
@@ -2,6 +2,7 @@ package datastore
import ( import (
"fmt" "fmt"
"net"
"net/url" "net/url"
"os" "os"
"strings" "strings"
@@ -126,16 +127,12 @@ func getMysqlConnectionString(dbConfig *settings.DatabaseConfig) (string, error)
} }
func getPostgresConnectionString(dbConfig *settings.DatabaseConfig) (string, error) { func getPostgresConnectionString(dbConfig *settings.DatabaseConfig) (string, error) {
host, port := "", "" host, port, err := net.SplitHostPort(dbConfig.DatabaseHost)
fields := strings.Split(dbConfig.DatabaseHost, ":")
if len(fields) != 2 { if err != nil {
return "", errs.ErrDatabaseHostInvalid return "", errs.ErrDatabaseHostInvalid
} }
host = strings.TrimSpace(fields[0])
port = strings.TrimSpace(fields[1])
if strings.HasPrefix(dbConfig.DatabaseHost, "/") { // unix socket path if strings.HasPrefix(dbConfig.DatabaseHost, "/") { // unix socket path
return fmt.Sprintf("postgres://%s:%s@:%s/%s?sslmode=%s&host=%s", return fmt.Sprintf("postgres://%s:%s@:%s/%s?sslmode=%s&host=%s",
url.QueryEscape(dbConfig.DatabaseUser), url.QueryEscape(dbConfig.DatabasePassword), port, dbConfig.DatabaseName, dbConfig.DatabaseSSLMode, host), nil url.QueryEscape(dbConfig.DatabaseUser), url.QueryEscape(dbConfig.DatabasePassword), port, dbConfig.DatabaseName, dbConfig.DatabaseSSLMode, host), nil