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

Fixed dbfwfilter rules.

Browse Source 
Fixed at_times not working if combined with on_queries.
This commit is contained in:
Markus Makela
2015-04-29 14:29:43 +03:00
parent 1755706ada
commit c190433c7d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/filter/dbfwfilter.c
View File

@ -977,7 +977,7 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
TIMERANGE *tr = NULL; TIMERANGE *tr = NULL;
while(tok){ while(tok){
if(strcmp(tok,"on_queries") == 0) if(strcmp(tok,"on_queries") == 0)
goto reparse_rule; break;
if(!check_time(tok)) if(!check_time(tok))
{ {
skygw_log_write(LOGFILE_ERROR,"dbfwfilter: Rule parsing failed, malformed time definition: %s",tok); skygw_log_write(LOGFILE_ERROR,"dbfwfilter: Rule parsing failed, malformed time definition: %s",tok);
@ -1003,8 +1003,12 @@ bool parse_rule(char* rule, FW_INSTANCE* instance)
tr = tmp; tr = tmp;
tok = strtok_r(NULL, " ,",&saveptr); tok = strtok_r(NULL, " ,",&saveptr);
} }
ruledef->active = tr; ruledef->active = tr;
if(strcmp(tok,"on_queries") == 0)
goto reparse_rule;
} }
else if(strcmp(tok,"regex") == 0) else if(strcmp(tok,"regex") == 0)
{ {