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
8f59c1ec
Unverified
Commit
8f59c1ec
authored
Aug 22, 2021
by
Viktor Söderqvist
Committed by
GitHub
Aug 21, 2021
Browse files
Let CONFIG GET * show both replicaof and its alias (#9395)
parent
492d8d09
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
8f59c1ec
...
@@ -1045,13 +1045,10 @@ void configGetCommand(client *c) {
...
@@ -1045,13 +1045,10 @@ void configGetCommand(client *c) {
addReplyBulkCString
(
c
,
buf
);
addReplyBulkCString
(
c
,
buf
);
matches
++
;
matches
++
;
}
}
if
(
stringmatch
(
pattern
,
"slaveof"
,
1
)
||
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
stringmatch
(
pattern
,
"replicaof"
,
1
))
char
*
optname
=
i
==
0
?
"replicaof"
:
"slaveof"
;
{
if
(
!
stringmatch
(
pattern
,
optname
,
1
))
continue
;
char
*
optname
=
stringmatch
(
pattern
,
"slaveof"
,
1
)
?
"slaveof"
:
"replicaof"
;
char
buf
[
256
];
char
buf
[
256
];
addReplyBulkCString
(
c
,
optname
);
addReplyBulkCString
(
c
,
optname
);
if
(
server
.
masterhost
)
if
(
server
.
masterhost
)
snprintf
(
buf
,
sizeof
(
buf
),
"%s %d"
,
snprintf
(
buf
,
sizeof
(
buf
),
"%s %d"
,
...
...
tests/unit/introspection.tcl
View file @
8f59c1ec
...
@@ -149,6 +149,7 @@ start_server {tags {"introspection"}} {
...
@@ -149,6 +149,7 @@ start_server {tags {"introspection"}} {
io-threads
io-threads
logfile
logfile
unixsocketperm
unixsocketperm
replicaof
slaveof
slaveof
requirepass
requirepass
server_cpulist
server_cpulist
...
...
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