mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
INFO command now reports replication info
This commit is contained in:
parent
0b420168b4
commit
a0f643ea4c
1
TODO
1
TODO
@ -1,6 +1,5 @@
|
||||
BEFORE REDIS 1.0.0-rc1
|
||||
|
||||
* Replication status in INFO command. role: (master|slave) slaveof: <host:port>, slavestatus: (disconnected|ok)
|
||||
* Add number of keys for every DB in INFO
|
||||
* maxmemory support
|
||||
* maxclients support
|
||||
|
23
redis.c
23
redis.c
@ -3489,6 +3489,8 @@ static void infoCommand(redisClient *c) {
|
||||
|
||||
info = sdscatprintf(sdsempty(),
|
||||
"redis_version:%s\r\n"
|
||||
"uptime_in_seconds:%d\r\n"
|
||||
"uptime_in_days:%d\r\n"
|
||||
"connected_clients:%d\r\n"
|
||||
"connected_slaves:%d\r\n"
|
||||
"used_memory:%zu\r\n"
|
||||
@ -3497,9 +3499,10 @@ static void infoCommand(redisClient *c) {
|
||||
"last_save_time:%d\r\n"
|
||||
"total_connections_received:%lld\r\n"
|
||||
"total_commands_processed:%lld\r\n"
|
||||
"uptime_in_seconds:%d\r\n"
|
||||
"uptime_in_days:%d\r\n"
|
||||
"role:%s\r\n"
|
||||
,REDIS_VERSION,
|
||||
uptime,
|
||||
uptime/(3600*24),
|
||||
listLength(server.clients)-listLength(server.slaves),
|
||||
listLength(server.slaves),
|
||||
server.usedmemory,
|
||||
@ -3508,9 +3511,21 @@ static void infoCommand(redisClient *c) {
|
||||
server.lastsave,
|
||||
server.stat_numconnections,
|
||||
server.stat_numcommands,
|
||||
uptime,
|
||||
uptime/(3600*24)
|
||||
server.masterhost == NULL ? "master" : "slave"
|
||||
);
|
||||
if (server.masterhost) {
|
||||
info = sdscatprintf(info,
|
||||
"master_host:%s\r\n"
|
||||
"master_port:%d\r\n"
|
||||
"master_link_status:%s\r\n"
|
||||
"master_last_io_seconds_ago:%d\r\n"
|
||||
,server.masterhost,
|
||||
server.masterport,
|
||||
(server.replstate == REDIS_REPL_CONNECTED) ?
|
||||
"up" : "down",
|
||||
(int)(time(NULL)-server.master->lastinteraction)
|
||||
);
|
||||
}
|
||||
addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",sdslen(info)));
|
||||
addReplySds(c,info);
|
||||
addReply(c,shared.crlf);
|
||||
|
Loading…
x
Reference in New Issue
Block a user