checkTcpBacklogSetting() now called in Sentinel mode too.

This commit is contained in:
antirez 2015-07-29 12:13:20 +02:00
parent 3c8861a73a
commit 4bc42ca7f6

View File

@ -3869,6 +3869,7 @@ int main(int argc, char **argv) {
if (background || server.pidfile) createPidFile(); if (background || server.pidfile) createPidFile();
redisSetProcTitle(argv[0]); redisSetProcTitle(argv[0]);
redisAsciiArt(); redisAsciiArt();
checkTcpBacklogSettings();
if (!server.sentinel_mode) { if (!server.sentinel_mode) {
/* Things not needed when running in Sentinel mode. */ /* Things not needed when running in Sentinel mode. */
@ -3876,7 +3877,6 @@ int main(int argc, char **argv) {
#ifdef __linux__ #ifdef __linux__
linuxMemoryWarnings(); linuxMemoryWarnings();
#endif #endif
checkTcpBacklogSettings();
loadDataFromDisk(); loadDataFromDisk();
if (server.cluster_enabled) { if (server.cluster_enabled) {
if (verifyClusterConfigWithData() == C_ERR) { if (verifyClusterConfigWithData() == C_ERR) {