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

Minor changes to #7037.

Browse Source
This commit is contained in:
antirez 2020-03-31 17:10:09 +02:00
parent 0c52ce6c8e
commit 1d13ff0b39
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/networking.c
View File

@ -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 "

2
src/server.c
View File

@ -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:%ld\r\n", "clients_in_timeout_table:%llu\r\n",
listLength(server.clients)-listLength(server.slaves), listLength(server.clients)-listLength(server.slaves),
maxin, maxout, maxin, maxout,
server.blocked_clients, server.blocked_clients,