gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' into redis_6_merge

Browse Source 
Former-commit-id: 40761e403166bf3342fe388ab742498f99245b1a
This commit is contained in:
John Sully 2020-03-17 00:09:48 -04:00
commit e800858c4c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.cpp
View File

@ -921,8 +921,15 @@ void configGetCommand(client *c) {
listIter li; listIter li;
listNode *ln; listNode *ln;
listRewind(g_pserver->masters, &li); listRewind(g_pserver->masters, &li);
bool fFirst = true;
while ((ln = listNext(&li))) while ((ln = listNext(&li)))
{ {
if (!fFirst)
{
addReplyBulkCString(c,optname);
matches++;
}
fFirst = false;
struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln); struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln);
snprintf(buf,sizeof(buf),"%s %d", snprintf(buf,sizeof(buf),"%s %d",
mi->masterhost, mi->masterport); mi->masterhost, mi->masterport);