fix#479

ppker · Nov 1, 2018 · 91e6172 · 91e6172
1 parent 351912f
commit 91e6172
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/backend/db.go b/backend/db.go
@@ -189,15 +189,19 @@ func (db *DB) Ping() error {
 	if db.checkConn == nil {
 		db.checkConn, err = db.newConn()
 		if err != nil {
-			db.checkConn.Close()
-			db.checkConn = nil
+			if db.checkConn != nil {
+				db.checkConn.Close()
+				db.checkConn = nil
+			}
 			return err
 		}
 	}
 	err = db.checkConn.Ping()
 	if err != nil {
-		db.checkConn.Close()
-		db.checkConn = nil
+		if db.checkConn != nil{
+			db.checkConn.Close()
+			db.checkConn = nil
+		}
 		return err
 	}
 	return nil

diff --git a/backend/db_test.go b/backend/db_test.go
@@ -0,0 +1,16 @@
+package backend
+
+import (
+	. "github.com/flike/kingshard/backend"
+
+	"testing"
+)
+
+func TestDB_Ping(t *testing.T) {
+	db, err := Open("127.0.0.1:3306", "root", "", "kingshard", 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+	db.Ping()
+}