summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2015-07-29 12:13:20 +0200
committerantirez <antirez@gmail.com>2015-07-29 12:13:20 +0200
commit4bc42ca7f6608c3e77c451c580c4b9c629480169 (patch)
tree4d92a6c04936666d11c6ead917ee7b7aa2bbc1b1
parent3c8861a73af8a472053fc3c0b47452a2b6051d53 (diff)
downloadredis-4bc42ca7f6608c3e77c451c580c4b9c629480169.tar.gz
checkTcpBacklogSetting() now called in Sentinel mode too.
-rw-r--r--src/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index dd906ed99..5ceef9aef 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3869,6 +3869,7 @@ int main(int argc, char **argv) {
if (background || server.pidfile) createPidFile();
redisSetProcTitle(argv[0]);
redisAsciiArt();
+ checkTcpBacklogSettings();
if (!server.sentinel_mode) {
/* Things not needed when running in Sentinel mode. */
@@ -3876,7 +3877,6 @@ int main(int argc, char **argv) {
#ifdef __linux__
linuxMemoryWarnings();
#endif
- checkTcpBacklogSettings();
loadDataFromDisk();
if (server.cluster_enabled) {
if (verifyClusterConfigWithData() == C_ERR) {