Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
54c71f2d
Commit
54c71f2d
authored
Jul 28, 2015
by
antirez
Browse files
RDMF: Redis -> Server in adjustOpenFilesLimit().
parent
813ff7fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
54c71f2d
...
@@ -1621,7 +1621,7 @@ void adjustOpenFilesLimit(void) {
...
@@ -1621,7 +1621,7 @@ void adjustOpenFilesLimit(void) {
server
.
maxclients
=
bestlimit
-
CONFIG_MIN_RESERVED_FDS
;
server
.
maxclients
=
bestlimit
-
CONFIG_MIN_RESERVED_FDS
;
if
(
server
.
maxclients
<
1
)
{
if
(
server
.
maxclients
<
1
)
{
serverLog
(
LL_WARNING
,
"Your current 'ulimit -n' "
serverLog
(
LL_WARNING
,
"Your current 'ulimit -n' "
"of %llu is not enough for
Redis
to start. "
"of %llu is not enough for
the server
to start. "
"Please increase your open file limit to at least "
"Please increase your open file limit to at least "
"%llu. Exiting."
,
"%llu. Exiting."
,
(
unsigned
long
long
)
oldlimit
,
(
unsigned
long
long
)
oldlimit
,
...
@@ -1632,7 +1632,7 @@ void adjustOpenFilesLimit(void) {
...
@@ -1632,7 +1632,7 @@ void adjustOpenFilesLimit(void) {
"requiring at least %llu max file descriptors."
,
"requiring at least %llu max file descriptors."
,
old_maxclients
,
old_maxclients
,
(
unsigned
long
long
)
maxfiles
);
(
unsigned
long
long
)
maxfiles
);
serverLog
(
LL_WARNING
,
"
Redis
can't set maximum open files "
serverLog
(
LL_WARNING
,
"
Server
can't set maximum open files "
"to %llu because of OS error: %s."
,
"to %llu because of OS error: %s."
,
(
unsigned
long
long
)
maxfiles
,
strerror
(
setrlimit_error
));
(
unsigned
long
long
)
maxfiles
,
strerror
(
setrlimit_error
));
serverLog
(
LL_WARNING
,
"Current maximum open files is %llu. "
serverLog
(
LL_WARNING
,
"Current maximum open files is %llu. "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment