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

Merge branch 'release-1.0GA' of https://github.com/mariadb-corporation/MaxScale into release-1.0GA

Browse Source
This commit is contained in:
Markus Makela
2014-12-10 18:06:48 +02:00
parent 2a623c6ec3 30361748cc
commit 89ccc7c927
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/service.c
View File

@ -765,7 +765,7 @@ int n = 0;
if ((flist = (FILTER_DEF **)malloc(sizeof(FILTER_DEF *))) == NULL) if ((flist = (FILTER_DEF **)malloc(sizeof(FILTER_DEF *))) == NULL)
{ {
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"Out of memory adding filters to service.\n"))); "Error : Out of memory adding filters to service.\n")));
return; return;
} }
ptr = strtok_r(filters, "|", &brkt); ptr = strtok_r(filters, "|", &brkt);
@ -776,14 +776,14 @@ int n = 0;
(n + 1) * sizeof(FILTER_DEF *))) == NULL) (n + 1) * sizeof(FILTER_DEF *))) == NULL)
{ {
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"Out of memory adding filters to service.\n"))); "Error : Out of memory adding filters to service.\n")));
return; return;
} }
if ((flist[n-1] = filter_find(trim(ptr))) == NULL) if ((flist[n-1] = filter_find(trim(ptr))) == NULL)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Unable to find filter '%s' for service '%s'\n", "Warning : Unable to find filter '%s' for service '%s'\n",
trim(ptr), service->name trim(ptr), service->name
))); )));
n--; n--;