More robust maxclients test.

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 9966f945a86ab22229147bc52d7c38c5e3dde490..46ae3ffa6a97ba01784cd31509af4fda3fb6b0d5 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1067,7 +1067,6 @@ void initServerConfig() {
     server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
     server.lua_client = NULL;
     server.lua_timedout = 0;
     server.lua_time_limit = REDIS_LUA_TIME_LIMIT;
     server.lua_client = NULL;
     server.lua_timedout = 0;

-    server.lua_protect_globals = 1;

 
     updateLRUClock();
     resetServerSaveParams();
 
     updateLRUClock();
     resetServerSaveParams();


@@ -1136,7 +1135,6 @@ void adjustOpenFilesLimit(void) {
     rlim_t maxfiles = server.maxclients+32;
     struct rlimit limit;
 
     rlim_t maxfiles = server.maxclients+32;
     struct rlimit limit;
 

-    if (maxfiles < 1024) maxfiles = 1024;

     if (getrlimit(RLIMIT_NOFILE,&limit) == -1) {
         redisLog(REDIS_WARNING,"Unable to obtain the current NOFILE limit (%s), assuming 1024 and setting the max clients configuration accordingly.",
             strerror(errno));
     if (getrlimit(RLIMIT_NOFILE,&limit) == -1) {
         redisLog(REDIS_WARNING,"Unable to obtain the current NOFILE limit (%s), assuming 1024 and setting the max clients configuration accordingly.",
             strerror(errno));