New hash fuzzing test.

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index eaa41a5dfe64d8d47ea4edd08b607cbb4d949475..2b1007b5cbd4bcfc8bac8e948c694616517ae938 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1153,7 +1153,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));


@@ -2042,7 +2041,7 @@ sds genRedisInfoString(char *section) {
         }
     }
 
         }
     }
 

-    /* Clusetr */
+    /* Cluster */

     if (allsections || defsections || !strcasecmp(section,"cluster")) {
         if (sections++) info = sdscat(info,"\r\n");
         info = sdscatprintf(info,
     if (allsections || defsections || !strcasecmp(section,"cluster")) {
         if (sections++) info = sdscat(info,"\r\n");
         info = sdscatprintf(info,


@@ -2302,8 +2301,12 @@ void daemonize(void) {
 }
 
 void version() {
 }
 
 void version() {

-    printf("Redis server v=%s sha=%s:%d malloc=%s\n", REDIS_VERSION,
-        redisGitSHA1(), atoi(redisGitDirty()) > 0, ZMALLOC_LIB);
+    printf("Redis server v=%s sha=%s:%d malloc=%s bits=%d\n",
+        REDIS_VERSION,
+        redisGitSHA1(),
+        atoi(redisGitDirty()) > 0,
+        ZMALLOC_LIB,
+        sizeof(long) == 4 ? 32 : 64);

     exit(0);
 }
 
     exit(0);
 }