alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use retry func while trying to ping SQL datastore (#630)

Browse Source 
* Use retry func while trying to ping SQL datastore

 - implements retry func specifically for SQL datastore ping
 - fmt fixes
 - using sqlx.Db.PingContext instead of sqlx.Db.Ping
 - propogate context to SQL datastore

* Rely on context from ServerOpt

* Consolidate log instances

* Cleanup

* Fix server usage in API tests
This commit is contained in:
Denis Makogon
2018-01-02 20:32:10 +02:00
committed by Reed Allman
parent 4a85806544
commit faaf5846ce
8 changed files with 117 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/datastore/datastore.go
View File

@@ -1,17 +1,19 @@
package datastore
import (
"context"
"fmt"
"net/url"
"github.com/fnproject/fn/api/common"
"github.com/fnproject/fn/api/datastore/internal/datastoreutil"
"github.com/fnproject/fn/api/datastore/sql"
"github.com/fnproject/fn/api/models"
"github.com/sirupsen/logrus"
)
func New(dbURL string) (models.Datastore, error) {
ds, err := newds(dbURL) // teehee
func New(ctx context.Context, dbURL string) (models.Datastore, error) {
ds, err := newds(ctx, dbURL) // teehee
if err != nil {
return nil, err
}
@@ -19,15 +21,16 @@ func New(dbURL string) (models.Datastore, error) {
return datastoreutil.MetricDS(datastoreutil.NewValidator(ds)), nil
}
func newds(dbURL string) (models.Datastore, error) {
func newds(ctx context.Context, dbURL string) (models.Datastore, error) {
log := common.Logger(ctx)
u, err := url.Parse(dbURL)
if err != nil {
logrus.WithError(err).WithFields(logrus.Fields{"url": dbURL}).Fatal("bad DB URL")
log.WithError(err).WithFields(logrus.Fields{"url": dbURL}).Fatal("bad DB URL")
}
logrus.WithFields(logrus.Fields{"db": u.Scheme}).Debug("creating new datastore")
log.WithFields(logrus.Fields{"db": u.Scheme}).Debug("creating new datastore")
switch u.Scheme {
case "sqlite3", "postgres", "mysql":
return sql.New(u)
return sql.New(ctx, u)
default:
return nil, fmt.Errorf("db type not supported %v", u.Scheme)
}