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
6922ccc0
Commit
6922ccc0
authored
Feb 13, 2020
by
antirez
Browse files
Tracking: fix sending messages bug + tracking off bug.
parent
40194a2a
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
6922ccc0
...
...
@@ -2250,15 +2250,19 @@ NULL
prefix
=
zrealloc
(
prefix
,
sizeof
(
robj
*
)
*
(
numprefix
+
1
));
prefix
[
numprefix
++
]
=
c
->
argv
[
j
];
}
else
{
zfree
(
prefix
);
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
}
/* Make sure options are compatible among each other and with the
* current state of the client. */
/* Options are ok: enable or disable the tracking for this client. */
if
(
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"on"
))
{
/* Before enabling tracking, make sure options are compatible
* among each other and with the current state of the client. */
if
(
!
bcast
&&
numprefix
)
{
addReplyError
(
c
,
"PREFIX option requires BCAST mode to be enabled"
);
addReplyError
(
c
,
"PREFIX option requires BCAST mode to be enabled"
);
zfree
(
prefix
);
return
;
}
...
...
@@ -2266,7 +2270,6 @@ NULL
if
(
c
->
flags
&
CLIENT_TRACKING
)
{
int
oldbcast
=
!!
c
->
flags
&
CLIENT_TRACKING_BCAST
;
if
(
oldbcast
!=
bcast
)
{
}
addReplyError
(
c
,
"You can't switch BCAST mode on/off before disabling "
"tracking for this client, and then re-enabling it with "
...
...
@@ -2274,13 +2277,12 @@ NULL
zfree
(
prefix
);
return
;
}
/* Options are ok: enable or disable the tracking for this client. */
if
(
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"on"
))
{
}
enableTracking
(
c
,
redir
,
bcast
,
prefix
,
numprefix
);
}
else
if
(
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"off"
))
{
disableTracking
(
c
);
}
else
{
zfree
(
prefix
);
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
...
...
src/tracking.c
View file @
6922ccc0
...
...
@@ -211,6 +211,12 @@ void sendTrackingMessage(client *c, char *keyname, size_t keylen, int proto) {
/* We use a static object to speedup things, however we assume
* that addReplyPubsubMessage() will not take a reference. */
addReplyPubsubMessage
(
c
,
TrackingChannelName
,
NULL
);
}
else
{
/* If are here, the client is not using RESP3, nor is
* redirecting to another client. We can't send anything to
* it since RESP2 does not support push messages in the same
* connection. */
return
;
}
/* Send the "value" part, which is the array of keys. */
...
...
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