fix: handle nil instances opts

Syncano · Jun 16, 2020 · 47253b4 · 47253b4
1 parent 61924c0
commit 47253b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/database/database.go b/database/database.go
@@ -66,7 +66,7 @@ func NewDB(opts, instancesOpts *pg.Options, logger *log.Logger, debug bool) *DB
 	commonDB := initDB(opts, logger, debug)
 	tenantDB := commonDB
 
-	if instancesOpts.Addr != opts.Addr || instancesOpts.Database != opts.Database {
+	if instancesOpts != nil && instancesOpts.Addr != opts.Addr || instancesOpts.Database != opts.Database {
 		tenantDB = initDB(instancesOpts, logger, debug)
 	}
 

diff --git a/echo_middleware/handlers.go b/echo_middleware/handlers.go
@@ -13,9 +13,7 @@ import (
 	"github.com/Syncano/pkg-go/util"
 )
 
-const (
-	ContextRequestID = "req_id"
-)
+const ContextRequestID = "req_id"
 
 func logg(c echo.Context, start time.Time, path string, l *zap.Logger, err error) {
 	res := c.Response()