mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
Fixed Issue 76 (redis-server crashes when it can't connect to MASTER and client connects to SLAVE)
This commit is contained in:
parent
1807985baf
commit
f72b934d14
1
TODO
1
TODO
@ -10,6 +10,7 @@ VERSION 1.1 TODO
|
||||
VERSION 1.2 TODO
|
||||
|
||||
* Basic Redis-cluster (at least all the features of the Ruby client distribute implementation + ability to set every key in M nodes).
|
||||
* Append mode log
|
||||
* Hashes (HSET, HGET, HEXISTS, HLEN, ...).
|
||||
* An utility able to export an .rdb file into a text-only JSON dump, we can't live anymore without such a tool. Probably an extension to redis-cli.
|
||||
|
||||
|
2
redis.c
2
redis.c
@ -4648,7 +4648,7 @@ static void infoCommand(redisClient *c) {
|
||||
server.masterport,
|
||||
(server.replstate == REDIS_REPL_CONNECTED) ?
|
||||
"up" : "down",
|
||||
(int)(time(NULL)-server.master->lastinteraction)
|
||||
server.master ? ((int)(time(NULL)-server.master->lastinteraction)) : -1
|
||||
);
|
||||
}
|
||||
for (j = 0; j < server.dbnum; j++) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user