balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Print server connection string in debug mode

Browse Source
This commit is contained in:
Dan Sosedoff 2014-12-06 12:44:56 -06:00
parent 52c6e599f7
commit 5b073c4978
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client.go
View File

@ -10,8 +10,9 @@ import (
) )
type Client struct { type Client struct {
db *sqlx.DB db *sqlx.DB
history []string history []string
connectionString string
} }
type Row []interface{} type Row []interface{}
@ -22,13 +23,14 @@ type Result struct {
} }
func NewClient() (*Client, error) { func NewClient() (*Client, error) {
db, err := sqlx.Open("postgres", getConnectionString()) str := getConnectionString()
db, err := sqlx.Open("postgres", str)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Client{db: db}, nil return &Client{db: db, connectionString: str}, nil
} }
func NewClientFromUrl(url string) (*Client, error) { func NewClientFromUrl(url string) (*Client, error) {
@ -38,7 +40,7 @@ func NewClientFromUrl(url string) (*Client, error) {
return nil, err return nil, err
} }
return &Client{db: db}, nil return &Client{db: db, connectionString: url}, nil
} }
func (client *Client) Test() error { func (client *Client) Test() error {

4
main.go
View File

@ -107,6 +107,10 @@ func initClient() {
exitWithMessage(err.Error()) exitWithMessage(err.Error())
} }
if options.Debug {
fmt.Println("Server connection string:", client.connectionString)
}
fmt.Println("Connecting to server...") fmt.Println("Connecting to server...")
err = client.Test() err = client.Test()
if err != nil { if err != nil {