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

Added more logging to trace log.

Browse Source
This commit is contained in:
Markus Makela
2015-04-09 22:07:53 +03:00
parent 86768966b9
commit 3fb59e020b
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/dbusers.c
View File

@ -973,7 +973,7 @@ getAllUsers(SERVICE *service, USERS *users)
if(havedb && wildcard_db_grant(dbnm)) if(havedb && wildcard_db_grant(dbnm))
{ {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources); rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources);
skygw_log_write(LOGFILE_DEBUG,"%s: Converted '%s' to %d individual database grants.",service->name,dbnm,rc); skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,dbnm,rc);
} }
else else
{ {
@ -1005,7 +1005,7 @@ getAllUsers(SERVICE *service, USERS *users)
/* Log the user being added with its db grants */ /* Log the user being added with its db grants */
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG|LOGFILE_TRACE,
"%s: User %s@%s for database %s added to " "%s: User %s@%s for database %s added to "
"service user table.", "service user table.",
service->name, service->name,
@ -1015,7 +1015,7 @@ getAllUsers(SERVICE *service, USERS *users)
} else { } else {
/* Log the user being added (without db grants) */ /* Log the user being added (without db grants) */
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG|LOGFILE_TRACE,
"%s: User %s@%s added to service user table.", "%s: User %s@%s added to service user table.",
service->name, service->name,
row[0], row[0],
@ -1028,7 +1028,7 @@ getAllUsers(SERVICE *service, USERS *users)
total_users++; total_users++;
} else { } else {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR|LOGFILE_TRACE,
"Warning: Failed to add user %s@%s for service [%s]. " "Warning: Failed to add user %s@%s for service [%s]. "
"This user will be unavailable via MaxScale.", "This user will be unavailable via MaxScale.",
row[0], row[0],
@ -1457,7 +1457,7 @@ getUsers(SERVICE *service, USERS *users)
if(wildcard_db_grant(row[5])) if(wildcard_db_grant(row[5]))
{ {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], row[5], service->resources); rc = add_wildcard_users(users, row[0], row[1], password, row[4], row[5], service->resources);
skygw_log_write(LOGFILE_DEBUG,"%s: Converted '%s' to %d individual database grants.",service->name,row[5],rc); skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,row[5],rc);
} }
else else
{ {
@ -1486,7 +1486,7 @@ getUsers(SERVICE *service, USERS *users)
/* Log the user being added with its db grants */ /* Log the user being added with its db grants */
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG|LOGFILE_TRACE,
"%s: User %s@%s for database %s added to " "%s: User %s@%s for database %s added to "
"service user table.", "service user table.",
service->name, service->name,
@ -1496,7 +1496,7 @@ getUsers(SERVICE *service, USERS *users)
} else { } else {
/* Log the user being added (without db grants) */ /* Log the user being added (without db grants) */
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG|LOGFILE_TRACE,
"%s: User %s@%s added to service user table.", "%s: User %s@%s added to service user table.",
service->name, service->name,
row[0], row[0],
@ -1509,7 +1509,7 @@ getUsers(SERVICE *service, USERS *users)
total_users++; total_users++;
} else { } else {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR|LOGFILE_TRACE,
"Warning: Failed to add user %s@%s for service [%s]. " "Warning: Failed to add user %s@%s for service [%s]. "
"This user will be unavailable via MaxScale.", "This user will be unavailable via MaxScale.",
row[0], row[0],

16
server/modules/routing/readconnroute.c
View File

@ -755,20 +755,10 @@ routeQuery(ROUTER *instance, void *router_session, GWBUF *queue)
break; break;
} }
CHK_PROTOCOL(((MySQLProtocol*)backend_dcb->protocol));
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [readconnroute:routeQuery] Routed command %d to dcb %p "
"with return value %d.",
pthread_self(),
mysql_command,
backend_dcb,
rc)));
LOGIF(LOGFILE_TRACE,skygw_log_write( LOGIF(LOGFILE_TRACE,skygw_log_write(
LOGFILE_TRACE, LOGFILE_DEBUG|LOGFILE_TRACE,
"Routed command [%#x] to '%s'%s%s", "Routed [%s] to '%s'%s%s",
mysql_command, STRPACKETTYPE(mysql_command),
backend_dcb->server->unique_name, backend_dcb->server->unique_name,
trc?": ":".", trc?": ":".",
trc?trc:"")); trc?trc:""));