Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
6a13193d
Commit
6a13193d
authored
Jun 07, 2014
by
antirez
Browse files
ROLE output improved for slaves.
Info about the replication state with the master added.
parent
d34c2fa3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
6a13193d
...
@@ -1353,11 +1353,23 @@ void roleCommand(redisClient *c) {
...
@@ -1353,11 +1353,23 @@ void roleCommand(redisClient *c) {
}
}
setDeferredMultiBulkLength
(
c
,
mbcount
,
slaves
);
setDeferredMultiBulkLength
(
c
,
mbcount
,
slaves
);
}
else
{
}
else
{
char
*
slavestate
=
NULL
;
addReplyMultiBulkLen
(
c
,
4
);
addReplyMultiBulkLen
(
c
,
4
);
addReplyBulkCBuffer
(
c
,
"slave"
,
5
);
addReplyBulkCBuffer
(
c
,
"slave"
,
5
);
addReplyBulkCString
(
c
,
server
.
masterhost
);
addReplyBulkCString
(
c
,
server
.
masterhost
);
addReplyLongLong
(
c
,
server
.
masterport
);
addReplyLongLong
(
c
,
server
.
masterport
);
addReplyLongLong
(
c
,
server
.
master
->
reploff
);
switch
(
server
.
repl_state
)
{
case
REDIS_REPL_NONE
:
slavestate
=
"none"
;
break
;
case
REDIS_REPL_CONNECT
:
slavestate
=
"connect"
;
break
;
case
REDIS_REPL_CONNECTING
:
slavestate
=
"connecting"
;
break
;
case
REDIS_REPL_RECEIVE_PONG
:
/* see next */
case
REDIS_REPL_TRANSFER
:
slavestate
=
"sync"
;
break
;
case
REDIS_REPL_CONNECTED
:
slavestate
=
"connected"
;
break
;
default:
slavestate
=
"unknown"
;
break
;
}
addReplyBulkCString
(
c
,
slavestate
);
addReplyLongLong
(
c
,
server
.
master
?
server
.
master
->
reploff
:
-
1
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment