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

Added slave remote port in log messages

Browse Source 
Added slave remote port in log messages
This commit is contained in:
MassimilianoPinto
2015-11-11 12:19:58 +01:00
parent 23b3c9d2b2
commit 8395bad394
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlog/blr.c
View File

@ -914,7 +914,7 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"%s: Slave %s:%d, server id %d, disconnected after %ld seconds. " "%s: Slave %s:%d, server id %d, disconnected after %ld seconds. "
"%d SQL commands, %d events sent (%lu bytes), binlog '%s', last position %lu", "%d SQL commands, %d events sent (%lu bytes), binlog '%s', last position %lu",
router->service->name, slave->dcb->remote, slave->port, router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
time(0) - slave->connect_time, time(0) - slave->connect_time,
slave->stats.n_queries, slave->stats.n_queries,

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

@ -1815,7 +1815,7 @@ uint32_t chksum;
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"%s: Slave %s:%d, server id %d requested binlog file %s from position %lu", "%s: Slave %s:%d, server id %d requested binlog file %s from position %lu",
router->service->name, slave->dcb->remote, router->service->name, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos))); slave->binlogfile, (unsigned long)slave->binlog_pos)));
@ -1956,7 +1956,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
LOGIF(LE, (skygw_log_write( LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR, LOGFILE_ERROR,
"Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file", "Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file",
slave->dcb->remote, slave->port, slave->serverid, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid,
slave->binlogfile))); slave->binlogfile)));
slave->cstate &= ~CS_BUSY; slave->cstate &= ~CS_BUSY;
@ -2013,7 +2013,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
LOGFILE_ERROR, LOGFILE_ERROR,
"Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file in rotate event", "Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file in rotate event",
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile))); slave->binlogfile)));
@ -2053,7 +2053,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
"Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s", "Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s",
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, slave->binlogfile,
read_errmsg))); read_errmsg)));
@ -2088,7 +2088,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
"%s: Slave %s:%i, server-id %d, binlog '%s', %s", "%s: Slave %s:%i, server-id %d, binlog '%s', %s",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, slave->binlogfile,
read_errmsg))); read_errmsg)));
@ -2155,7 +2155,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
"%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.", "%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos))); slave->binlogfile, (unsigned long)slave->binlog_pos)));
} }
@ -2165,7 +2165,7 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1];
"%s: Slave %s:%d, server-id %d is up to date '%s', position %lu.", "%s: Slave %s:%d, server-id %d is up to date '%s', position %lu.",
router->service->name, router->service->name,
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, (unsigned long)slave->binlog_pos))); slave->binlogfile, (unsigned long)slave->binlog_pos)));
} }
@ -2257,6 +2257,7 @@ ROUTER_INSTANCE *router = slave->router;
slave->cstate |= CS_EXPECTCB; slave->cstate |= CS_EXPECTCB;
spinlock_release(&slave->catch_lock); spinlock_release(&slave->catch_lock);
poll_fake_write_event(slave->dcb); poll_fake_write_event(slave->dcb);
return 0; return 0;
} }
@ -2410,7 +2411,7 @@ char err_msg[BINLOG_ERROR_MSG_LEN+1];
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
"Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s", "Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s",
slave->dcb->remote, slave->dcb->remote,
slave->port, ntohs((slave->dcb->ipv4).sin_port),
slave->serverid, slave->serverid,
slave->binlogfile, slave->binlogfile,
err_msg))); err_msg)));