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
995b9ffe
Commit
995b9ffe
authored
May 04, 2016
by
antirez
Browse files
Allow CONFIG GET during loading.
Thanks to @oranagra for the idea of allowing CONFIG GET during loading.
parent
5500c510
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
995b9ffe
...
@@ -1923,6 +1923,12 @@ int rewriteConfig(char *path) {
...
@@ -1923,6 +1923,12 @@ int rewriteConfig(char *path) {
*----------------------------------------------------------------------------*/
*----------------------------------------------------------------------------*/
void
configCommand
(
client
*
c
)
{
void
configCommand
(
client
*
c
)
{
/* Only allow CONFIG GET while loading. */
if
(
server
.
loading
&&
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"get"
))
{
addReplyError
(
c
,
"Only CONFIG GET is allowed during loading"
);
return
;
}
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"set"
))
{
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"set"
))
{
if
(
c
->
argc
!=
4
)
goto
badarity
;
if
(
c
->
argc
!=
4
)
goto
badarity
;
configSetCommand
(
c
);
configSetCommand
(
c
);
...
...
src/server.c
View file @
995b9ffe
...
@@ -254,7 +254,7 @@ struct redisCommand redisCommandTable[] = {
...
@@ -254,7 +254,7 @@ struct redisCommand redisCommandTable[] = {
{
"slaveof"
,
slaveofCommand
,
3
,
"ast"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"slaveof"
,
slaveofCommand
,
3
,
"ast"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"role"
,
roleCommand
,
1
,
"lst"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"role"
,
roleCommand
,
1
,
"lst"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"debug"
,
debugCommand
,
-
1
,
"as"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"debug"
,
debugCommand
,
-
1
,
"as"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"config"
,
configCommand
,
-
2
,
"at"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"config"
,
configCommand
,
-
2
,
"
l
at"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"subscribe"
,
subscribeCommand
,
-
2
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"subscribe"
,
subscribeCommand
,
-
2
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"unsubscribe"
,
unsubscribeCommand
,
-
1
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"unsubscribe"
,
unsubscribeCommand
,
-
1
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"psubscribe"
,
psubscribeCommand
,
-
2
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"psubscribe"
,
psubscribeCommand
,
-
2
,
"pslt"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
...
...
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