From 47253b4bf6b60ad5fa4419aa75a6be257bd70439 Mon Sep 17 00:00:00 2001
From: Robert Kopaczewski <rk@23doors.com>
Date: Tue, 16 Jun 2020 14:00:01 +0200
Subject: [PATCH] fix: handle nil instances opts

---
 database/database.go        | 2 +-
 echo_middleware/handlers.go | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/database/database.go b/database/database.go
index ffe18ea..f80067c 100644
--- 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
index 27f0c3c..ba50aeb 100644
--- 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()