balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Fix issue with default port in bookmark; cleanup

Browse Source
This commit is contained in:
Dan Sosedoff 2016-11-15 21:58:58 -06:00
parent d74bc06cbd
commit 59018287de
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -30,8 +30,10 @@ func initClientUsingBookmark(bookmarkPath, bookmarkName string) (*client.Client,
if err != nil { if err != nil {
return nil, err return nil, err
} }
opt := bookmark.ConvertToOptions() opt := bookmark.ConvertToOptions()
var connStr string var connStr string
if opt.Url != "" { // if the bookmark has url set, use it if opt.Url != "" { // if the bookmark has url set, use it
connStr = opt.Url connStr = opt.Url
} else { } else {
@ -40,10 +42,12 @@ func initClientUsingBookmark(bookmarkPath, bookmarkName string) (*client.Client,
return nil, fmt.Errorf("error building connection string: %v", err) return nil, fmt.Errorf("error building connection string: %v", err)
} }
} }
var ssh *shared.SSHInfo var ssh *shared.SSHInfo
if !bookmark.SSHInfoIsEmpty() { if !bookmark.SSHInfoIsEmpty() {
ssh = &bookmark.Ssh ssh = &bookmark.Ssh
} }
return client.NewFromUrl(connStr, ssh) return client.NewFromUrl(connStr, ssh)
} }
@ -54,17 +58,16 @@ func initClient() {
var cl *client.Client var cl *client.Client
var err error var err error
if options.Bookmark != "" { if options.Bookmark != "" {
cl, err = initClientUsingBookmark(bookmarks.Path(), options.Bookmark) cl, err = initClientUsingBookmark(bookmarks.Path(), options.Bookmark)
if err != nil {
exitWithMessage(err.Error())
}
} else { } else {
cl, err = client.New() cl, err = client.New()
}
if err != nil { if err != nil {
exitWithMessage(err.Error()) exitWithMessage(err.Error())
} }
}
if command.Opts.Debug { if command.Opts.Debug {
fmt.Println("Server connection string:", cl.ConnectionString) fmt.Println("Server connection string:", cl.ConnectionString)

7
pkg/bookmarks/bookmarks.go
View File

@ -95,10 +95,15 @@ func GetBookmark(bookmarkPath string, bookmarkName string) (Bookmark, error) {
if err != nil { if err != nil {
return Bookmark{}, err return Bookmark{}, err
} }
bookmark, ok := bookmarks[bookmarkName] bookmark, ok := bookmarks[bookmarkName]
if !ok { if !ok {
return Bookmark{}, fmt.Errorf("couldn't find a bookmark with name %s", bookmarkName) return Bookmark{}, fmt.Errorf("couldn't find a bookmark with name %s", bookmarkName)
} }
return bookmark, nil
if bookmark.Port == 0 {
bookmark.Port = 5432
}
return bookmark, nil
} }