balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Fix startup error when DATABASE_URL is set

Browse Source
This commit is contained in:
Dan Sosedoff
2019-01-25 10:29:24 -06:00
parent ae60604ef1
commit a7959ad0fa
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cli/cli.go
View File

@@ -65,7 +65,6 @@ func initClient() {
} else { } else {
cl, err = client.New() cl, err = client.New()
} }
if err != nil { if err != nil {
exitWithMessage(err.Error()) exitWithMessage(err.Error())
} }
@@ -75,12 +74,11 @@ func initClient() {
} }
fmt.Println("Connecting to server...") fmt.Println("Connecting to server...")
err = cl.Test() if err := cl.Test(); err != nil {
if err != nil {
msg := err.Error() msg := err.Error()
// Check if we're trying to connect to the default database. // Check if we're trying to connect to the default database.
if command.Opts.DbName == "" { if command.Opts.DbName == "" && command.Opts.Url == "" {
// If database does not exist, allow user to connect from the UI. // If database does not exist, allow user to connect from the UI.
if strings.Contains(msg, "database") && strings.Contains(msg, "does not exist") { if strings.Contains(msg, "database") && strings.Contains(msg, "does not exist") {
fmt.Println("Error:", msg) fmt.Println("Error:", msg)