From 033080e11ec5a535695577749cb4235a7371b1fd Mon Sep 17 00:00:00 2001 From: counterpoint Date: Fri, 19 Jun 2015 15:31:34 +0100 Subject: [PATCH] Fix bugs --- server/core/dcb.c | 12 ++++++------ server/core/server.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/core/dcb.c b/server/core/dcb.c index 2ea1b0bac..b10b7f04b 100644 --- a/server/core/dcb.c +++ b/server/core/dcb.c @@ -1339,8 +1339,8 @@ dcb_maybe_add_persistent(DCB *dcb) LOGIF(LD, (skygw_log_write( LOGFILE_DEBUG, "%lu [dcb_connect] Adding DCB to persistent pool, user %s.\n", - user, - pthread_self()))); + pthread_self(), + user))); dcb->user = strdup(user); dcb->persistentstart = time(NULL); spinlock_acquire(&dcb->server->persistlock); @@ -1354,16 +1354,16 @@ dcb_maybe_add_persistent(DCB *dcb) } else { - LOGIF(LD, (skygw_log_write( + LOGIF(LD, (skygw_log_write( LOGFILE_DEBUG, "%lu [dcb_connect] Not adding DCB to persistent pool, user %s, " "max for pool %d, error handle called %s, hung flag %s, pool count %d.\n", + pthread_self(), user ? user : "", - (dcb->server && dcb->server>persistpoolmax) ? dcb->server->persistpoolmax : 0, + (dcb->server && dcb->server->persistpoolmax) ? dcb->server->persistpoolmax : 0, dcb->dcb_errhandle_called ? "true" : "false", (dcb->flags & DCBF_HUNG) ? "true" : "false", - poolcount, - pthread_self()))); + poolcount))); } return false; } diff --git a/server/core/server.c b/server/core/server.c index 96bec4a79..a9577252a 100644 --- a/server/core/server.c +++ b/server/core/server.c @@ -344,7 +344,7 @@ char *stat; dcb_printf(dcb, "\tPersistent pool size: %d\n", server->stats.n_persistent); dcb_printf(dcb, "\tPersistent measured pool size: %d\n", - dcb_persistent_clean_count(server, false)); + dcb_persistent_clean_count(server->persistent, false)); dcb_printf(dcb, "\tPersistent pool max size: %d\n", server->persistpoolmax); dcb_printf(dcb, "\tPersistent max time (secs): %d\n", @@ -506,7 +506,7 @@ SERVER_PARAM *param; dcb_printf(dcb, "\tPersistent pool size: %d\n", server->stats.n_persistent); dcb_printf(dcb, "\tPersistent measured pool size: %d\n", - dcb_persistent_clean_count(server, false)); + dcb_persistent_clean_count(server->persistent, false)); dcb_printf(dcb, "\tPersistent pool max size: %d\n", server->persistpoolmax); dcb_printf(dcb, "\tPersistent max time (secs): %d\n",