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

Merge remote-tracking branch 'origin/develop' into MXS-329

Browse Source 
Conflicts:
	server/core/session.c
This commit is contained in:
counterpoint
2015-09-10 13:07:27 +01:00
parent 296e306daa 9f01d0ec3f
commit cfeaf7d6e9
69 changed files with 3037 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/filter/qlafilter.c
View File

@ -277,12 +277,13 @@ char *remote, *userName;
(char *)malloc(strlen(my_instance->filebase) + 20))
== NULL)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Memory allocation for qla filter "
"file name failed due to %d, %s.",
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
free(my_session);
return NULL;
}
@ -315,12 +316,13 @@ char *remote, *userName;
if (my_session->fp == NULL)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Opening output file for qla "
"fileter failed due to %d, %s",
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
free(my_session->filename);
free(my_session);
my_session = NULL;
@ -329,12 +331,13 @@ char *remote, *userName;
}
else
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Error : Memory allocation for qla filter failed due to "
"%d, %s.",
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
}
return my_session;
}

3
server/modules/filter/test/harness_common.c
View File

@ -131,7 +131,8 @@ int open_file(char* str, unsigned int write)
mode = O_RDONLY;
}
if((fd = open(str,mode,S_IRWXU|S_IRGRP|S_IXGRP|S_IXOTH)) < 0){
printf("Error %d: %s\n",errno,strerror(errno));
char errbuf[STRERROR_BUFLEN];
printf("Error %d: %s\n", errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
return fd;
}