From 99fdf9cdecca460b77b0fc2143ebac55dc9f96dc Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Thu, 19 Nov 2015 17:54:23 +0100 Subject: [PATCH] Fixed reference to LOGIF macro Fixed reference to LOGIF macro --- server/modules/routing/binlog/blr.c | 23 +++++----- server/modules/routing/binlog/blr_file.c | 8 ++-- server/modules/routing/binlog/blr_slave.c | 52 ++++++++++------------- 3 files changed, 36 insertions(+), 47 deletions(-) diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c index 7a2484164..930379c12 100644 --- a/server/modules/routing/binlog/blr.c +++ b/server/modules/routing/binlog/blr.c @@ -866,18 +866,17 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session; atomic_add(&router->stats.n_registered, -1); if (slave->state > 0) { - LOGIF(LM, (skygw_log_write_flush( - LOGFILE_MESSAGE, - "%s: Slave %s:%d, server id %d, disconnected after %ld seconds. " - "%d SQL commands, %d events sent (%lu bytes), binlog '%s', last position %lu", - router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), - slave->serverid, - time(0) - slave->connect_time, - slave->stats.n_queries, - slave->stats.n_events, - slave->stats.n_bytes, - slave->binlogfile, - (unsigned long)slave->binlog_pos))); + MXS_NOTICE("%s: Slave %s:%d, server id %d, disconnected after %ld seconds. " + "%d SQL commands, %d events sent (%lu bytes), binlog '%s', " + "last position %lu", + router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), + slave->serverid, + time(0) - slave->connect_time, + slave->stats.n_queries, + slave->stats.n_events, + slave->stats.n_bytes, + slave->binlogfile, + (unsigned long)slave->binlog_pos); } else { MXS_NOTICE("%s: Slave %s, server id %d, disconnected after %ld seconds. " "%d SQL commands", diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c index 7c2cad30f..e1132fa4f 100644 --- a/server/modules/routing/binlog/blr_file.c +++ b/server/modules/routing/binlog/blr_file.c @@ -425,8 +425,7 @@ struct stat statb; hdr->ok = SLAVE_POS_READ_OK; snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "blr_read_binlog called with invalid file->fd, pos %lu", pos); spinlock_release(&file->lock); - LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, - "Slave has failed fstat %s", errmsg))); + MXS_ERROR("Slave has failed fstat %s", errmsg); return NULL; } } @@ -965,9 +964,8 @@ int fde_seen = 0; router->pending_transaction = 1; pending_transaction = 0; - LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, - "Binlog '%s' ends at position %lu and has an incomplete transaction at %lu. ", - router->binlog_name, router->current_pos, router->binlog_position))); + MXS_ERROR("Binlog '%s' ends at position %lu and has an incomplete transaction at %lu. ", + router->binlog_name, router->current_pos, router->binlog_position); return 0; } else { diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c index 77ba7e83b..43543ac5d 100644 --- a/server/modules/routing/binlog/blr_slave.c +++ b/server/modules/routing/binlog/blr_slave.c @@ -1792,13 +1792,11 @@ uint32_t chksum; slave->state = BLRS_DUMPING; - LOGIF(LM, (skygw_log_write( - LOGFILE_MESSAGE, - "%s: Slave %s:%d, server id %d requested binlog file %s from position %lu", - router->service->name, slave->dcb->remote, - ntohs((slave->dcb->ipv4).sin_port), - slave->serverid, - slave->binlogfile, (unsigned long)slave->binlog_pos))); + MXS_NOTICE("%s: Slave %s:%d, server id %d requested binlog file %s from position %lu", + router->service->name, slave->dcb->remote, + ntohs((slave->dcb->ipv4).sin_port), + slave->serverid, + slave->binlogfile, (unsigned long)slave->binlog_pos); if (slave->binlog_pos != router->binlog_position || strcmp(slave->binlogfile, router->binlog_name) != 0) @@ -1934,11 +1932,10 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1]; poll_fake_write_event(slave->dcb); return rval; } - LOGIF(LE, (skygw_log_write( - LOGFILE_ERROR, - "Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file", + MXS_ERROR("Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup " + "failed to open binlog file", slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, - slave->binlogfile))); + slave->binlogfile); slave->cstate &= ~CS_BUSY; slave->state = BLRS_ERRORED; @@ -1989,13 +1986,12 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1]; poll_fake_write_event(slave->dcb); return rval; } - LOGIF(LE, (skygw_log_write( - LOGFILE_ERROR, - "Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup failed to open binlog file in rotate event", + MXS_ERROR("Slave %s:%i, server-id %d, binlog '%s': blr_slave_catchup " + "failed to open binlog file in rotate event", slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, - slave->binlogfile))); + slave->binlogfile); slave->state = BLRS_ERRORED; @@ -2029,13 +2025,13 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1]; slave->stats.n_failed_read++; if (hdr.ok == SLAVE_POS_READ_ERR) { - LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, - "Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s", + MXS_ERROR("%s Slave %s:%i, server-id %d, binlog '%s', %s", + router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, slave->binlogfile, - read_errmsg))); + read_errmsg); spinlock_acquire(&slave->catch_lock); @@ -2063,14 +2059,13 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1]; spinlock_release(&router->lock); - LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, - "%s: Slave %s:%i, server-id %d, binlog '%s', %s", + MXS_ERROR("%s: Slave %s:%i, server-id %d, binlog '%s', %s", router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, slave->binlogfile, - read_errmsg))); + read_errmsg); /* * Close the slave session and socket @@ -2133,23 +2128,21 @@ char read_errmsg[BINLOG_ERROR_MSG_LEN+1]; slave->stats.n_caughtup++; if (slave->stats.n_caughtup == 1) { - LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, - "%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.", + MXS_ERROR("%s: Slave %s:%d, server-id %d is now up to date '%s', position %lu.", router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, - slave->binlogfile, (unsigned long)slave->binlog_pos))); + slave->binlogfile, (unsigned long)slave->binlog_pos); } else if ((slave->stats.n_caughtup % 50) == 0) { - LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, - "%s: Slave %s:%d, server-id %d is up to date '%s', position %lu.", + MXS_ERROR("%s: Slave %s:%d, server-id %d is up to date '%s', position %lu.", router->service->name, slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, - slave->binlogfile, (unsigned long)slave->binlog_pos))); + slave->binlogfile, (unsigned long)slave->binlog_pos); } } } @@ -2397,13 +2390,12 @@ char err_msg[BINLOG_ERROR_MSG_LEN+1]; if ((record = blr_read_binlog(router, file, 4, &hdr, err_msg)) == NULL) { if (hdr.ok != SLAVE_POS_READ_OK) { - LOGIF(LE, (skygw_log_write(LOGFILE_ERROR, - "Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s", + MXS_ERROR("Slave %s:%i, server-id %d, binlog '%s', blr_read_binlog failure: %s", slave->dcb->remote, ntohs((slave->dcb->ipv4).sin_port), slave->serverid, slave->binlogfile, - err_msg))); + err_msg); } blr_close_binlog(router, file);