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

Merge branch 'blr' into develop

Browse Source
This commit is contained in:
Mark Riddoch
2015-02-03 17:19:06 +00:00
parent e02ce560bf e9af90e4b6
commit 0083e62c41
10 changed files with 667 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/hashtable.c
View File

@ -180,6 +180,7 @@ HASHENTRIES *entry, *ptr;
}
free(table->entries);
hashtable_write_unlock(table);
if (!table->ht_isflat)
{
free(table);

10
server/core/service.c
View File

@ -1091,8 +1091,8 @@ int service_refresh_users(SERVICE *service) {
if (! spinlock_acquire_nowait(&service->users_table_spin)) {
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"%lu [service_refresh_users] failed to get get lock for loading new users' table: another thread is loading users",
pthread_self())));
"%s: [service_refresh_users] failed to get get lock for loading new users' table: another thread is loading users",
service->name)));
return 1;
}
@ -1100,12 +1100,12 @@ int service_refresh_users(SERVICE *service) {
/* check if refresh rate limit has exceeded */
if ( (time(NULL) < (service->rate_limit.last + USERS_REFRESH_TIME)) || (service->rate_limit.nloads > USERS_REFRESH_MAX_PER_TIME)) {
spinlock_release(&service->users_table_spin);
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Refresh rate limit exceeded for load of users' table for service '%s'.",
"%s: Refresh rate limit exceeded for load of users' table.",
service->name)));
spinlock_release(&service->users_table_spin);
return 1;
}
@ -1427,4 +1427,4 @@ void service_shutdown()
svc = svc->next;
}
spinlock_release(&service_spin);
}
}