hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New log messages for DISCONNECT commands

Browse Source 
New log messages for DISCONNECT commands
This commit is contained in:
MassimilianoPinto
2015-03-17 18:43:00 +01:00
parent bf9d417187
commit 35890e4e7c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/routing/binlog/blr_slave.c
View File

@ -1898,8 +1898,10 @@ int len, id_len, seqno = 2;
strcpy(state, "not found"); strcpy(state, "not found");
len = 5 + id_len + strlen(state) + 1; len = 5 + id_len + strlen(state) + 1;
if ((pkt = gwbuf_alloc(len)) == NULL) if ((pkt = gwbuf_alloc(len)) == NULL)
return 0; return 0;
ptr = GWBUF_DATA(pkt); ptr = GWBUF_DATA(pkt);
encode_value(ptr, id_len + 2 + strlen(state), 24); // Add length of data packet encode_value(ptr, id_len + 2 + strlen(state), 24); // Add length of data packet
ptr += 3; ptr += 3;
@ -1977,7 +1979,13 @@ blr_slave_disconnect_server(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, int se
n = blr_slave_send_disconnected_server(router, slave, server_id, 0); n = blr_slave_send_disconnected_server(router, slave, server_id, 0);
} }
return n; if (n == 0) {
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, "Error: gwbuf memory allocation in "
"DISCONNECT ALL for [%s], server_id [%d]",
sptr->dcb->remote, sptr->serverid)));
}
return 1;
} }
/** /**
@ -2015,9 +2023,6 @@ blr_slave_disconnect_all(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
/* skip servers with state = 0 */ /* skip servers with state = 0 */
if (sptr->state != 0) if (sptr->state != 0)
{ {
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "DISCONNECT ALL: closing [%s], server_id [%d]",
sptr->dcb->remote, sptr->serverid)));
sprintf(server_id, "%d", sptr->serverid); sprintf(server_id, "%d", sptr->serverid);
sprintf(state, "disconnected"); sprintf(state, "disconnected");
@ -2032,6 +2037,10 @@ blr_slave_disconnect_all(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
return 1; return 1;
} }
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: Slave %s, server id %d, disconnected by %s@%s",
router->service->name,
sptr->dcb->remote, sptr->serverid, slave->dcb->user, slave->dcb->remote)));
ptr = GWBUF_DATA(pkt); ptr = GWBUF_DATA(pkt);
encode_value(ptr, len - 4, 24); // Add length of data packet encode_value(ptr, len - 4, 24); // Add length of data packet