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

* 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

View File

@@ -8,17 +8,19 @@ import (
"github.com/gin-gonic/gin"
)
type ServerOption func(*Server)
type ServerOption func(context.Context, *Server) error
func EnableShutdownEndpoint(halt context.CancelFunc) ServerOption {
return func(s *Server) {
func EnableShutdownEndpoint(ctx context.Context, halt context.CancelFunc) ServerOption {
return func(ctx context.Context, s *Server) error {
s.Router.GET("/shutdown", s.handleShutdown(halt))
return nil
}
}
func LimitRequestBody(max int64) ServerOption {
return func(s *Server) {
return func(ctx context.Context, s *Server) error {
s.Router.Use(limitRequestBody(max))
return nil
}
}