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
c326f288
Unverified
Commit
c326f288
authored
Oct 04, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Oct 04, 2019
Browse files
Merge pull request #6308 from oranagra/repl-diskless-load-config
fix error handling on config parsing of repl-diskless-load
parents
3eaff294
1026d2ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
c326f288
...
@@ -438,6 +438,7 @@ void loadServerConfigFromString(char *config) {
...
@@ -438,6 +438,7 @@ void loadServerConfigFromString(char *config) {
server
.
repl_diskless_load
=
configEnumGetValue
(
repl_diskless_load_enum
,
argv
[
1
]);
server
.
repl_diskless_load
=
configEnumGetValue
(
repl_diskless_load_enum
,
argv
[
1
]);
if
(
server
.
repl_diskless_load
==
INT_MIN
)
{
if
(
server
.
repl_diskless_load
==
INT_MIN
)
{
err
=
"argument must be 'disabled', 'on-empty-db', 'swapdb' or 'flushdb'"
;
err
=
"argument must be 'disabled', 'on-empty-db', 'swapdb' or 'flushdb'"
;
goto
loaderr
;
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"repl-diskless-sync-delay"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"repl-diskless-sync-delay"
)
&&
argc
==
2
)
{
server
.
repl_diskless_sync_delay
=
atoi
(
argv
[
1
]);
server
.
repl_diskless_sync_delay
=
atoi
(
argv
[
1
]);
...
...
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