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
f72b934d
Commit
f72b934d
authored
Oct 29, 2009
by
antirez
Browse files
Fixed Issue 76 (redis-server crashes when it can't connect to MASTER and client connects to SLAVE)
parent
1807985b
Changes
2
Hide whitespace changes
Inline
Side-by-side
TODO
View file @
f72b934d
...
@@ -10,6 +10,7 @@ VERSION 1.1 TODO
...
@@ -10,6 +10,7 @@ VERSION 1.1 TODO
VERSION 1.2 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).
* 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, ...).
* 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.
* 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.
...
...
redis.c
View file @
f72b934d
...
@@ -4648,7 +4648,7 @@ static void infoCommand(redisClient *c) {
...
@@ -4648,7 +4648,7 @@ static void infoCommand(redisClient *c) {
server
.
masterport
,
server
.
masterport
,
(
server
.
replstate
==
REDIS_REPL_CONNECTED
)
?
(
server
.
replstate
==
REDIS_REPL_CONNECTED
)
?
"up"
:
"down"
,
"up"
:
"down"
,
(
int
)(
time
(
NULL
)
-
server
.
master
->
lastinteraction
)
server
.
master
?
(
(
int
)(
time
(
NULL
)
-
server
.
master
->
lastinteraction
)
)
:
-
1
);
);
}
}
for
(
j
=
0
;
j
<
server
.
dbnum
;
j
++
)
{
for
(
j
=
0
;
j
<
server
.
dbnum
;
j
++
)
{
...
...
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