Skip to content

Commit f72b934

Browse files
committed
Fixed Issue 76 (redis-server crashes when it can't connect to MASTER and client connects to SLAVE)
1 parent 1807985 commit f72b934

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

TODO

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ VERSION 1.1 TODO
1010
VERSION 1.2 TODO
1111

1212
* Basic Redis-cluster (at least all the features of the Ruby client distribute implementation + ability to set every key in M nodes).
13+
* Append mode log
1314
* Hashes (HSET, HGET, HEXISTS, HLEN, ...).
1415
* 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.
1516

redis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4648,7 +4648,7 @@ static void infoCommand(redisClient *c) {
46484648
server.masterport,
46494649
(server.replstate == REDIS_REPL_CONNECTED) ?
46504650
"up" : "down",
4651-
(int)(time(NULL)-server.master->lastinteraction)
4651+
server.master ? ((int)(time(NULL)-server.master->lastinteraction)) : -1
46524652
);
46534653
}
46544654
for (j = 0; j < server.dbnum; j++) {

0 commit comments

Comments
 (0)