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

Fix misses in slavelag.c formatting.

Browse Source 
astyle is more thorough.
This commit is contained in:
Johan Wikman
2016-03-04 09:01:43 +02:00
parent 6b4ffc8506
commit 59edee26c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/filter/slavelag.c
View File

@ -230,7 +230,7 @@ createInstance(char **options, FILTER_PARAMETER **params)
if (my_instance->nomatch) if (my_instance->nomatch)
{ {
if (regcomp(&my_instance->nore,my_instance->nomatch,cflags)) if (regcomp(&my_instance->nore, my_instance->nomatch, cflags))
{ {
MXS_ERROR("lagfilter: Failed to compile regex '%s'.", my_instance->nomatch); MXS_ERROR("lagfilter: Failed to compile regex '%s'.", my_instance->nomatch);
} }
@ -339,8 +339,8 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
if (my_instance->nomatch == NULL || if (my_instance->nomatch == NULL ||
(my_instance->nomatch && regexec(&my_instance->nore, sql, 0, NULL, 0) != 0)) (my_instance->nomatch && regexec(&my_instance->nore, sql, 0, NULL, 0) != 0))
{ {
if (my_instance->match == NULL|| if (my_instance->match == NULL ||
(my_instance->match && regexec(&my_instance->re,sql,0,NULL,0) == 0)) (my_instance->match && regexec(&my_instance->re, sql, 0, NULL, 0) == 0))
{ {
my_session->hints_left = my_instance->count; my_session->hints_left = my_instance->count;
my_session->last_modification = now; my_session->last_modification = now;
@ -357,7 +357,7 @@ routeQuery(FILTER *instance, void *session, GWBUF *queue)
my_session->hints_left--; my_session->hints_left--;
my_instance->stats.n_add_count++; my_instance->stats.n_add_count++;
} }
else if (difftime(now,my_session->last_modification) < my_instance->time) else if (difftime(now, my_session->last_modification) < my_instance->time)
{ {
queue->hint = hint_create_route(queue->hint, HINT_ROUTE_TO_MASTER, NULL); queue->hint = hint_create_route(queue->hint, HINT_ROUTE_TO_MASTER, NULL);
my_instance->stats.n_add_time++; my_instance->stats.n_add_time++;