From 6a661fd08cbac5e955b2087bc9de6949b96f4af5 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Wed, 20 May 2020 14:03:38 +0100
Subject: [PATCH] check if the db conn is nil before doing anything (#1652)

---
 store/cockroach/cockroach.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/store/cockroach/cockroach.go b/store/cockroach/cockroach.go
index 13b12d9d..bd6ae34f 100644
--- a/store/cockroach/cockroach.go
+++ b/store/cockroach/cockroach.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/lib/pq"
+	"github.com/micro/go-micro/v2/logger"
 	"github.com/micro/go-micro/v2/store"
 	"github.com/pkg/errors"
 )
@@ -87,6 +88,10 @@ func (s *sqlStore) createDB(database, table string) error {
 }
 
 func (s *sqlStore) initDB(database, table string) error {
+	if s.db == nil {
+		return errors.New("Database connection not initialised")
+	}
+
 	// Create the namespace's database
 	_, err := s.db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s;", database))
 	if err != nil {
@@ -456,7 +461,11 @@ func NewStore(opts ...store.Option) store.Store {
 	// mark known databases
 	s.databases = make(map[string]bool)
 	// best-effort configure the store
-	s.configure()
+	if err := s.configure(); err != nil {
+		if logger.V(logger.ErrorLevel, logger.DefaultLogger) {
+			logger.Error("Error configuring store ", err)
+		}
+	}
 
 	// return store
 	return s