mirror of
https://github.com/fluencelabs/redis
synced 2025-05-03 14:32:14 +00:00
Add casting to match printf format.
adjustOpenFilesLimit() and clusterUpdateSlotsWithConfig() that were assuming uint64_t is the same as unsigned long long, which is true probably for all the systems out there that we target, but still GCC emitted a warning since technically they are two different types.
This commit is contained in:
parent
12d1d18b59
commit
2b1385b9ec
14
src/redis.c
14
src/redis.c
@ -1482,24 +1482,28 @@ void adjustOpenFilesLimit(void) {
|
|||||||
redisLog(REDIS_WARNING,"Your current 'ulimit -n' "
|
redisLog(REDIS_WARNING,"Your current 'ulimit -n' "
|
||||||
"of %llu is not enough for Redis to start. "
|
"of %llu is not enough for Redis to start. "
|
||||||
"Please increase your open file limit to at least "
|
"Please increase your open file limit to at least "
|
||||||
"%llu. Exiting.", oldlimit, maxfiles);
|
"%llu. Exiting.",
|
||||||
|
(unsigned long long) oldlimit,
|
||||||
|
(unsigned long long) maxfiles);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
redisLog(REDIS_WARNING,"You requested maxclients of %d "
|
redisLog(REDIS_WARNING,"You requested maxclients of %d "
|
||||||
"requiring at least %llu max file descriptors.",
|
"requiring at least %llu max file descriptors.",
|
||||||
old_maxclients, maxfiles);
|
old_maxclients,
|
||||||
|
(unsigned long long) maxfiles);
|
||||||
redisLog(REDIS_WARNING,"Redis can't set maximum open files "
|
redisLog(REDIS_WARNING,"Redis can't set maximum open files "
|
||||||
"to %llu because of OS error: %s.",
|
"to %llu because of OS error: %s.",
|
||||||
maxfiles, strerror(setrlimit_error));
|
(unsigned long long) maxfiles, strerror(setrlimit_error));
|
||||||
redisLog(REDIS_WARNING,"Current maximum open files is %llu. "
|
redisLog(REDIS_WARNING,"Current maximum open files is %llu. "
|
||||||
"maxclients has been reduced to %d to compensate for "
|
"maxclients has been reduced to %d to compensate for "
|
||||||
"low ulimit. "
|
"low ulimit. "
|
||||||
"If you need higher maxclients increase 'ulimit -n'.",
|
"If you need higher maxclients increase 'ulimit -n'.",
|
||||||
oldlimit, server.maxclients);
|
(unsigned long long) oldlimit, server.maxclients);
|
||||||
} else {
|
} else {
|
||||||
redisLog(REDIS_NOTICE,"Increased maximum number of open files "
|
redisLog(REDIS_NOTICE,"Increased maximum number of open files "
|
||||||
"to %llu (it was originally set to %llu).",
|
"to %llu (it was originally set to %llu).",
|
||||||
maxfiles, oldlimit);
|
(unsigned long long) maxfiles,
|
||||||
|
(unsigned long long) oldlimit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user