Add default connect_timeout option to connection string (#626)
* Add default connect_timeout option to connection string * Add an extra test
This commit is contained in:
@@ -6,9 +6,11 @@ import (
|
||||
neturl "net/url"
|
||||
"os"
|
||||
"os/user"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/jackc/pgpassfile"
|
||||
|
||||
"github.com/sosedoff/pgweb/pkg/command"
|
||||
)
|
||||
|
||||
@@ -88,6 +90,11 @@ func FormatURL(opts command.Options) (string, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// Configure default connect timeout
|
||||
if opts.OpenTimeout > 0 {
|
||||
params["connect_timeout"] = strconv.Itoa(opts.OpenTimeout)
|
||||
}
|
||||
|
||||
// Rebuild query params
|
||||
query := neturl.Values{}
|
||||
for k, v := range params {
|
||||
@@ -142,6 +149,11 @@ func BuildStringFromOptions(opts command.Options) (string, error) {
|
||||
opts.Pass = lookupPassword(opts, nil)
|
||||
}
|
||||
|
||||
// Configure default connect timeout
|
||||
if opts.OpenTimeout > 0 {
|
||||
query.Add("connect_timeout", strconv.Itoa(opts.OpenTimeout))
|
||||
}
|
||||
|
||||
url := neturl.URL{
|
||||
Scheme: "postgres",
|
||||
Host: fmt.Sprintf("%v:%v", opts.Host, opts.Port),
|
||||
|
||||
Reference in New Issue
Block a user