Browse Source
Allow postgresql to use standard environment variables for connection (#3413)
pull/3415/head
John W Higgins
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
22 additions and
10 deletions
-
weed/filer/postgres/postgres_store.go
-
weed/filer/postgres2/postgres2_store.go
|
|
@ -3,6 +3,7 @@ package postgres |
|
|
|
import ( |
|
|
|
"database/sql" |
|
|
|
"fmt" |
|
|
|
"strconv" |
|
|
|
"time" |
|
|
|
|
|
|
|
_ "github.com/lib/pq" |
|
|
@ -11,10 +12,6 @@ import ( |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/util" |
|
|
|
) |
|
|
|
|
|
|
|
const ( |
|
|
|
CONNECTION_URL_PATTERN = "host=%s port=%d sslmode=%s connect_timeout=30" |
|
|
|
) |
|
|
|
|
|
|
|
func init() { |
|
|
|
filer.Stores = append(filer.Stores, &PostgresStore{}) |
|
|
|
} |
|
|
@ -56,7 +53,16 @@ func (store *PostgresStore) initialize(upsertQuery string, enableUpsert bool, us |
|
|
|
UpsertQueryTemplate: upsertQuery, |
|
|
|
} |
|
|
|
|
|
|
|
sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, hostname, port, sslmode) |
|
|
|
sqlUrl := "connect_timeout=30" |
|
|
|
if hostname != "" { |
|
|
|
sqlUrl += " host=" + hostname |
|
|
|
} |
|
|
|
if port != 0 { |
|
|
|
sqlUrl += " port=" + strconv.Itoa(port) |
|
|
|
} |
|
|
|
if sslmode != "" { |
|
|
|
sqlUrl += " sslmode=" + sslmode |
|
|
|
} |
|
|
|
if user != "" { |
|
|
|
sqlUrl += " user=" + user |
|
|
|
} |
|
|
|
|
|
@ -4,6 +4,7 @@ import ( |
|
|
|
"context" |
|
|
|
"database/sql" |
|
|
|
"fmt" |
|
|
|
"strconv" |
|
|
|
"time" |
|
|
|
|
|
|
|
_ "github.com/lib/pq" |
|
|
@ -13,10 +14,6 @@ import ( |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/util" |
|
|
|
) |
|
|
|
|
|
|
|
const ( |
|
|
|
CONNECTION_URL_PATTERN = "host=%s port=%d sslmode=%s connect_timeout=30" |
|
|
|
) |
|
|
|
|
|
|
|
var _ filer.BucketAware = (*PostgresStore2)(nil) |
|
|
|
|
|
|
|
func init() { |
|
|
@ -61,7 +58,16 @@ func (store *PostgresStore2) initialize(createTable, upsertQuery string, enableU |
|
|
|
UpsertQueryTemplate: upsertQuery, |
|
|
|
} |
|
|
|
|
|
|
|
sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, hostname, port, sslmode) |
|
|
|
sqlUrl := "connect_timeout=30" |
|
|
|
if hostname != "" { |
|
|
|
sqlUrl += " host=" + hostname |
|
|
|
} |
|
|
|
if port != 0 { |
|
|
|
sqlUrl += " port=" + strconv.Itoa(port) |
|
|
|
} |
|
|
|
if sslmode != "" { |
|
|
|
sqlUrl += " sslmode=" + sslmode |
|
|
|
} |
|
|
|
if user != "" { |
|
|
|
sqlUrl += " user=" + user |
|
|
|
} |
|
|
|