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
e916f451
Commit
e916f451
authored
Jun 12, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
6bf65138
bcecbebb
Changes
1
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
e916f451
...
...
@@ -509,14 +509,16 @@ void loadServerConfigFromString(char *config) {
server
.
rdb_filename
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"active-defrag-threshold-lower"
)
&&
argc
==
2
)
{
server
.
active_defrag_threshold_lower
=
atoi
(
argv
[
1
]);
if
(
server
.
active_defrag_threshold_lower
<
0
)
{
err
=
"active-defrag-threshold-lower must be 0 or greater"
;
if
(
server
.
active_defrag_threshold_lower
<
0
||
server
.
active_defrag_threshold_lower
>
1000
)
{
err
=
"active-defrag-threshold-lower must be between 0 and 1000"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"active-defrag-threshold-upper"
)
&&
argc
==
2
)
{
server
.
active_defrag_threshold_upper
=
atoi
(
argv
[
1
]);
if
(
server
.
active_defrag_threshold_upper
<
0
)
{
err
=
"active-defrag-threshold-upper must be 0 or greater"
;
if
(
server
.
active_defrag_threshold_upper
<
0
||
server
.
active_defrag_threshold_upper
>
1000
)
{
err
=
"active-defrag-threshold-upper must be between 0 and 1000"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"active-defrag-ignore-bytes"
)
&&
argc
==
2
)
{
...
...
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