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

Removed MASTER_PASSWORD from logs

Browse Source 
Removed MASTER_PASSWORD from logs
This commit is contained in:
MassimilianoPinto
2015-07-14 17:32:42 +02:00
parent df17527527
commit 7b9d54d1d4
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/binlog/blr_master.c
View File

@ -1162,8 +1162,7 @@ static REP_HEADER phdr;
"Error packet in binlog stream.%s @ %d.", "Error packet in binlog stream.%s @ %d.",
router->binlog_name, router->binlog_name,
router->binlog_position))); router->binlog_position)));
blr_log_packet(LOGFILE_ERROR, "Error Packet:",
ptr, len);
router->stats.n_binlog_errors++; router->stats.n_binlog_errors++;
} }
} }

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

@ -505,14 +505,13 @@ int query_len;
/* get current data */ /* get current data */
blr_master_get_config(router, current_master); blr_master_get_config(router, current_master);
LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, "%s: 'RESET SLAVE executed'. Previous state MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s', MASTER_PASSWORD='%s'", LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, "%s: 'RESET SLAVE executed'. Previous state MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s'",
router->service->name, router->service->name,
current_master->host, current_master->host,
current_master->port, current_master->port,
current_master->logfile, current_master->logfile,
current_master->pos, current_master->pos,
current_master->user, current_master->user)));
current_master->password)));
/* remove master.ini */ /* remove master.ini */
strncpy(path, router->binlogdir, PATH_MAX); strncpy(path, router->binlogdir, PATH_MAX);
@ -2919,22 +2918,17 @@ int blr_handle_change_master(ROUTER_INSTANCE* router, char *command, char *error
} }
router->password = strdup(ptr); router->password = strdup(ptr);
LOGIF(LT, (skygw_log_write(LOGFILE_TRACE, "%s: New MASTER_PASSWORD is [%s]",
router->service->name,
router->password)));
free(master_password); free(master_password);
} }
LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, "%s: 'CHANGE MASTER TO executed'. Previous state MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s', MASTER_PASSWORD='%s'. New state is MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s', MASTER_PASSWORD='%s'", LOGIF(LM, (skygw_log_write(LOGFILE_MESSAGE, "%s: 'CHANGE MASTER TO executed'. Previous state MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s'. New state is MASTER_HOST='%s', MASTER_PORT=%i, MASTER_LOG_FILE='%s', MASTER_LOG_POS=%lu, MASTER_USER='%s'",
router->service->name, router->service->name,
current_master->host,current_master->port, current_master->logfile, current_master->pos, current_master->user, current_master->password, current_master->host,current_master->port, current_master->logfile, current_master->pos, current_master->user,
router->service->dbref->server->name, router->service->dbref->server->name,
router->service->dbref->server->port, router->service->dbref->server->port,
router->binlog_name, router->binlog_name,
router->binlog_position, router->binlog_position,
router->user, router->user)));
router->password)));
blr_master_free_config(current_master); blr_master_free_config(current_master);