re
/
ledisdb
forked from mirror/ledisdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix slave role err, ip and port must be master

This commit is contained in:
siddontang 2015-02-14 09:25:01 +08:00
parent 87cbf6cefc
commit 3cd534aefb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/cmd_replication.go
View File

@ -188,9 +188,11 @@ func roleCommand(c *client) error {
} }
c.app.m.Lock() c.app.m.Lock()
isMaster := len(c.app.cfg.SlaveOf) == 0 slaveof := c.app.cfg.SlaveOf
c.app.m.Unlock() c.app.m.Unlock()
isMaster := len(slaveof) == 0
ay := make([]interface{}, 0, 5) ay := make([]interface{}, 0, 5)
var lastId int64 = 0 var lastId int64 = 0
@ -217,7 +219,7 @@ func roleCommand(c *client) error {
c.app.slock.Unlock() c.app.slock.Unlock()
ay = append(ay, items) ay = append(ay, items)
} else { } else {
host, port, _ := splitHostPort(c.app.cfg.Addr) host, port, _ := splitHostPort(slaveof)
ay = append(ay, []byte("slave")) ay = append(ay, []byte("slave"))
ay = append(ay, []byte(host)) ay = append(ay, []byte(host))
ay = append(ay, int64(port)) ay = append(ay, int64(port))