return error from db.SetupDatabaseConnection

This commit is contained in:
Danny van Kooten 2016-12-11 15:37:51 +01:00
parent 7104397afa
commit 8ca48819d3
2 changed files with 10 additions and 7 deletions

5
ana.go
View File

@ -16,7 +16,10 @@ func main() {
} }
// setup database connection // setup database connection
conn := db.SetupDatabaseConnection() conn, err := db.SetupDatabaseConnection()
if err != nil {
log.Fatal(err)
}
defer conn.Close() defer conn.Close()
// parse & run cli commands // parse & run cli commands

View File

@ -4,26 +4,26 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"log"
"os" "os"
) )
var Conn *sql.DB var Conn *sql.DB
func SetupDatabaseConnection() *sql.DB { // SetupDatabaseConnection opens up & returns a SQL connection
func SetupDatabaseConnection() (*sql.DB, error) {
var err error var err error
var dataSourceName = fmt.Sprintf("%s:%s@%s/%s", os.Getenv("ANA_DATABASE_USER"), os.Getenv("ANA_DATABASE_PASSWORD"), os.Getenv("ANA_DATABASE_HOST"), os.Getenv("ANA_DATABASE_NAME")) var dataSourceName = fmt.Sprintf("%s:%s@%s/%s", os.Getenv("ANA_DATABASE_USER"), os.Getenv("ANA_DATABASE_PASSWORD"), os.Getenv("ANA_DATABASE_HOST"), os.Getenv("ANA_DATABASE_NAME"))
Conn, err = sql.Open("mysql", dataSourceName) Conn, err = sql.Open("mysql", dataSourceName)
if err != nil { if err != nil {
log.Fatal(err.Error()) // Just for example purpose. You should use proper error handling instead of panic return nil, err
} }
// Open doesn't open a connection. Validate DSN data: // Open doesn't open a connection right away. Validate DSN by calling Ping().
err = Conn.Ping() err = Conn.Ping()
if err != nil { if err != nil {
log.Fatal(err.Error()) // proper error handling instead of panic in your app return nil, err
} }
return Conn return Conn, nil
} }