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
9f347fab
Commit
9f347fab
authored
Mar 31, 2020
by
antirez
Browse files
Minor changes to #7037.
parent
a509400d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/networking.c
View file @
9f347fab
...
@@ -374,10 +374,19 @@ void addReplyErrorLength(client *c, const char *s, size_t len) {
...
@@ -374,10 +374,19 @@ void addReplyErrorLength(client *c, const char *s, size_t len) {
* they are rare and may hint at errors in a script or a bug in Redis. */
* they are rare and may hint at errors in a script or a bug in Redis. */
int
ctype
=
getClientType
(
c
);
int
ctype
=
getClientType
(
c
);
if
(
ctype
==
CLIENT_TYPE_MASTER
||
ctype
==
CLIENT_TYPE_SLAVE
||
c
->
id
==
CLIENT_ID_AOF
)
{
if
(
ctype
==
CLIENT_TYPE_MASTER
||
ctype
==
CLIENT_TYPE_SLAVE
||
c
->
id
==
CLIENT_ID_AOF
)
{
char
*
to
=
c
->
id
==
CLIENT_ID_AOF
?
"AOF-client"
:
char
*
to
,
*
from
;
ctype
==
CLIENT_TYPE_MASTER
?
"master"
:
"replica"
;
char
*
from
=
c
->
id
==
CLIENT_ID_AOF
?
"server"
:
if
(
c
->
id
==
CLIENT_ID_AOF
)
{
ctype
==
CLIENT_TYPE_MASTER
?
"replica"
:
"master"
;
to
=
"AOF-loading-client"
;
from
=
"server"
;
}
else
if
(
ctype
==
CLIENT_TYPE_MASTER
)
{
to
=
"master"
;
from
=
"replica"
;
}
else
{
to
=
"replica"
;
from
=
"master"
;
}
char
*
cmdname
=
c
->
lastcmd
?
c
->
lastcmd
->
name
:
"<unknown>"
;
char
*
cmdname
=
c
->
lastcmd
?
c
->
lastcmd
->
name
:
"<unknown>"
;
serverLog
(
LL_WARNING
,
"== CRITICAL == This %s is sending an error "
serverLog
(
LL_WARNING
,
"== CRITICAL == This %s is sending an error "
"to its %s: '%s' after processing the command "
"to its %s: '%s' after processing the command "
...
...
src/server.c
View file @
9f347fab
...
@@ -3976,7 +3976,7 @@ sds genRedisInfoString(const char *section) {
...
@@ -3976,7 +3976,7 @@ sds genRedisInfoString(const char *section) {
"client_recent_max_output_buffer:%zu
\r\n
"
"client_recent_max_output_buffer:%zu
\r\n
"
"blocked_clients:%d
\r\n
"
"blocked_clients:%d
\r\n
"
"tracking_clients:%d
\r\n
"
"tracking_clients:%d
\r\n
"
"clients_in_timeout_table:%l
d
\r\n
"
,
"clients_in_timeout_table:%l
lu
\r\n
"
,
listLength
(
server
.
clients
)
-
listLength
(
server
.
slaves
),
listLength
(
server
.
clients
)
-
listLength
(
server
.
slaves
),
maxin
,
maxout
,
maxin
,
maxout
,
server
.
blocked_clients
,
server
.
blocked_clients
,
...
...
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