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
34e20658
Commit
34e20658
authored
Jul 12, 2013
by
Salvatore Sanfilippo
Browse files
Merge pull request #1193 from tnm/patch-1
Make sure the log standardizes on 'timeout'
parents
123b221d
f39a0bdb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
34e20658
...
...
@@ -1554,7 +1554,7 @@ void replicationCron(void) {
if
(
server
.
masterhost
&&
server
.
repl_state
==
REDIS_REPL_CONNECTED
&&
(
time
(
NULL
)
-
server
.
master
->
lastinteraction
)
>
server
.
repl_timeout
)
{
redisLog
(
REDIS_WARNING
,
"MASTER time
out: no data nor PING received..."
);
redisLog
(
REDIS_WARNING
,
"MASTER timeout: no data nor PING received..."
);
freeClient
(
server
.
master
);
}
...
...
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