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
51943a78
Commit
51943a78
authored
Feb 25, 2014
by
antirez
Browse files
Deprecate Redis Sentinel in 2.6.
Everybody should use the more robust implementation shipped with 2.8.
parent
2fc65c84
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
51943a78
...
...
@@ -417,8 +417,6 @@ void loadServerConfigFromString(char *config) {
err
=
"sentinel directive while not in sentinel mode"
;
goto
loaderr
;
}
err
=
sentinelHandleConfiguration
(
argv
+
1
,
argc
-
1
);
if
(
err
)
goto
loaderr
;
}
}
else
{
err
=
"Bad directive or wrong number of arguments"
;
goto
loaderr
;
...
...
src/redis.c
View file @
51943a78
...
...
@@ -1110,11 +1110,6 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
* to detect transfer failures. */
run_with_period
(
1000
)
replicationCron
();
/* Run the sentinel timer if we are in sentinel mode. */
run_with_period
(
100
)
{
if
(
server
.
sentinel_mode
)
sentinelTimer
();
}
server
.
cronloops
++
;
return
1000
/
server
.
hz
;
}
...
...
src/sentinel.c
View file @
51943a78
This diff is collapsed.
Click to expand it.
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