Merge pull request #28 from BkSouX/master
Close database properly if database connection failed or an error occured
This commit is contained in:
commit
9819280fc9
|
@ -33,3 +33,4 @@ yarn-error.log*
|
|||
|
||||
# vscode
|
||||
__debug_bin
|
||||
.idea
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
package database
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"log"
|
||||
"net/url"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
// Load mysql driver
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
|
||||
|
@ -18,15 +21,15 @@ import (
|
|||
)
|
||||
|
||||
// SetupDatabase connects to the database using environment variables
|
||||
func SetupDatabase() *sql.DB {
|
||||
func SetupDatabase() (*sql.DB, error) {
|
||||
|
||||
address, err := url.Parse(os.Getenv("MYSQL_URL"))
|
||||
if err != nil {
|
||||
log.Fatalf("Could not parse mysql url: %s\n", err)
|
||||
return nil, errors.Wrap(err, "Could not parse mysql url")
|
||||
}
|
||||
|
||||
if address.String() == "" {
|
||||
log.Fatalln("ERROR: Environment variable MYSQL_URL missing, exiting")
|
||||
return nil, errors.New("Environment variable MYSQL_URL missing, exiting")
|
||||
}
|
||||
|
||||
queryValues := address.Query()
|
||||
|
@ -49,33 +52,23 @@ func SetupDatabase() *sql.DB {
|
|||
time.Sleep(time.Second)
|
||||
continue
|
||||
} else {
|
||||
log.Fatalln("ERROR: Could not connect to database, exiting")
|
||||
return nil, errors.New("Could not connect to database, exiting")
|
||||
}
|
||||
}
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
tryCount = 0
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
|
||||
for {
|
||||
if err := db.Ping(); err != nil {
|
||||
if tryCount < 4 {
|
||||
tryCount++
|
||||
log.Printf("Could not ping database: %s. Will retry after 1 second", err.Error())
|
||||
time.Sleep(time.Second)
|
||||
continue
|
||||
} else {
|
||||
log.Fatalln("ERROR: Could not ping database, exiting")
|
||||
}
|
||||
}
|
||||
|
||||
break
|
||||
if err := db.PingContext(ctx); err != nil {
|
||||
return nil, errors.Wrap(err, "Could not ping database, exiting")
|
||||
}
|
||||
|
||||
db.SetMaxOpenConns(80)
|
||||
|
||||
return db
|
||||
return db, nil
|
||||
}
|
||||
|
||||
func MigrateDatabase(db *sql.DB) error {
|
||||
|
|
|
@ -18,6 +18,7 @@ require (
|
|||
github.com/joho/godotenv v1.3.0
|
||||
github.com/nf/cr2 v0.0.0-20180623103828-4699471a17ed
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
|
||||
github.com/pkg/errors v0.8.1
|
||||
github.com/urfave/cli v1.22.3 // indirect
|
||||
github.com/vektah/gqlparser v1.3.1
|
||||
github.com/vektah/gqlparser/v2 v2.0.1
|
||||
|
|
|
@ -29,12 +29,15 @@ func main() {
|
|||
|
||||
devMode := os.Getenv("DEVELOPMENT") == "1"
|
||||
|
||||
db := database.SetupDatabase()
|
||||
db, err := database.SetupDatabase()
|
||||
if err != nil {
|
||||
log.Panicf("Could not connect to database: %s\n", err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
// Migrate database
|
||||
if err := database.MigrateDatabase(db); err != nil {
|
||||
log.Fatalf("Could not migrate database: %s\n", err)
|
||||
log.Panicf("Could not migrate database: %s\n", err)
|
||||
}
|
||||
|
||||
rootRouter := mux.NewRouter()
|
||||
|
@ -95,5 +98,5 @@ func main() {
|
|||
|
||||
}
|
||||
|
||||
log.Fatal(http.ListenAndServe(":"+apiListenUrl.Port(), rootRouter))
|
||||
log.Panic(http.ListenAndServe(":"+apiListenUrl.Port(), rootRouter))
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue