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

Fix bugs

Browse Source
This commit is contained in:
counterpoint 2015-06-19 15:31:34 +01:00
parent ef428b9229
commit 033080e11e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dcb.c
View File

@ -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;
}

4
server/core/server.c
View File

@ -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",