update to latest codis master

yc850k · Mar 1, 2015 · 431a85d · 431a85d
1 parent 830d0da
commit 431a85d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/servergroup.go b/servergroup.go
@@ -33,7 +33,7 @@ func getSlave(master *models.Server) (*models.Server, error) {
 
 	for _, s := range group.Servers {
 		if s.Type == models.SERVER_TYPE_SLAVE {
-			return &s, nil
+			return s, nil
 		}
 	}
 
@@ -76,7 +76,7 @@ func CheckAliveAndPromote(groups []models.ServerGroup) ([]models.Server, error)
 			serverCnt++
 			rc := acf(s.Addr, 5*time.Second)
 			news := s
-			go PingServer(rc, &news, errCh)
+			go PingServer(rc, news, errCh)
 		}
 	}
 

diff --git a/servergroup_test.go b/servergroup_test.go
@@ -16,11 +16,11 @@ var (
 	redisServer, _ = miniredis.Run()
 	groups1        = []models.ServerGroup{
 		models.ServerGroup{
-			Servers: []models.Server{
-				models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_MASTER, Addr: "localhost:xxx"},
-				models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_SLAVE, Addr: redisServer.Addr()},
-				models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_SLAVE, Addr: "xx"},
-				models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_OFFLINE, Addr: "xx"},
+			Servers: []*models.Server{
+				&models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_MASTER, Addr: "localhost:xxx"},
+				&models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_SLAVE, Addr: redisServer.Addr()},
+				&models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_SLAVE, Addr: "xx"},
+				&models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_OFFLINE, Addr: "xx"},
 			},
 		},
 	}
@@ -118,8 +118,8 @@ func TestCheckAliveAndPromote(t *testing.T) {
 	//test no slave
 	groups = []models.ServerGroup{
 		models.ServerGroup{
-			Servers: []models.Server{
-				models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_MASTER, Addr: "dead master"},
+			Servers: []*models.Server{
+				&models.Server{GroupId: GROUP_ID, Type: models.SERVER_TYPE_MASTER, Addr: "dead master"},
 			},
 		},
 	}