From 7db56c8b5f77a647e2a72fd6c31c0484c2d41d60 Mon Sep 17 00:00:00 2001
From: richardxz <richardxiang@yunify.com>
Date: Mon, 17 Sep 2018 15:16:20 +0800
Subject: [PATCH] modify db client's  initialization function

---
 pkg/client/dbclient.go | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkg/client/dbclient.go b/pkg/client/dbclient.go
index ee50f05fd..3c80077d7 100644
--- a/pkg/client/dbclient.go
+++ b/pkg/client/dbclient.go
@@ -15,13 +15,12 @@ package client
 
 import (
 	"fmt"
+	"log"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/golang/glog"
 	"github.com/jinzhu/gorm"
 
-	"log"
-
 	"kubesphere.io/kubesphere/pkg/logs"
 	"kubesphere.io/kubesphere/pkg/options"
 )
@@ -31,6 +30,24 @@ var dbClient *gorm.DB
 const database = "kubesphere"
 
 func NewDBClient() *gorm.DB {
+	user := options.ServerOptions.GetMysqlUser()
+	passwd := options.ServerOptions.GetMysqlPassword()
+	addr := options.ServerOptions.GetMysqlAddr()
+	conn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", user, passwd, addr, database)
+
+	db, err := gorm.Open("mysql", conn)
+
+	if err != nil {
+		glog.Error(err)
+		panic(err)
+	}
+
+	db.SetLogger(log.New(logs.GlogWriter{}, " ", 0))
+
+	return db
+}
+
+func NewSharedDBClient() *gorm.DB {
 
 	if dbClient != nil {
 		err := dbClient.DB().Ping()
@@ -42,23 +59,5 @@ func NewDBClient() *gorm.DB {
 		}
 	}
 
-	user := options.ServerOptions.GetMysqlUser()
-	passwd := options.ServerOptions.GetMysqlPassword()
-	addr := options.ServerOptions.GetMysqlAddr()
-	if dbClient == nil {
-		conn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", user, passwd, addr, database)
-		glog.Info(conn)
-		db, err := gorm.Open("mysql", conn)
-
-		if err != nil {
-			glog.Error(err)
-			panic(err)
-		}
-
-		db.SetLogger(log.New(logs.GlogWriter{}, " ", 0))
-		dbClient = db
-		return dbClient
-	}
-
-	return dbClient
+	return NewDBClient()
 }