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

Fix to bug #617, http://bugs.skysql.com/show_bug.cgi?id=617

Browse Source 
When filewriter_init failed due to full disk, error branch freed messages twice. Removed unnecessary free command.
This commit is contained in:
VilhoRaatikka
2014-12-02 23:58:28 +02:00
parent aab30f2eea
commit f2c2e4f81c
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
log_manager/log_manager.cc
View File

@ -445,17 +445,6 @@ static bool logmanager_init_nomutex(
return_succp: return_succp:
if (err != 0) if (err != 0)
{ {
if (lm != NULL)
{
if (lm->lm_clientmes != NULL)
{
skygw_message_done(lm->lm_clientmes);
}
if (lm->lm_logmes != NULL)
{
skygw_message_done(lm->lm_logmes);
}
}
/** This releases memory of all created objects */ /** This releases memory of all created objects */
logmanager_done_nomutex(); logmanager_done_nomutex();
fprintf(stderr, "*\n* Error : Initializing log manager failed.\n*\n"); fprintf(stderr, "*\n* Error : Initializing log manager failed.\n*\n");

10
utils/skygw_utils.cc
View File

@ -1680,12 +1680,12 @@ static bool file_write_header(
if (wbytes1 != 1 || wbytes2 != 1 || wbytes3 != 1 || wbytes4 != 1) { if (wbytes1 != 1 || wbytes2 != 1 || wbytes3 != 1 || wbytes4 != 1) {
fprintf(stderr, fprintf(stderr,
"* Writing header %s %s %s to %s failed.\n", "\nError : Writing header %s %s %s %s failed.\n",
header_buf1, header_buf1,
header_buf2, header_buf2,
header_buf3, header_buf3,
header_buf4); header_buf4);
perror("Logfile header write.\n"); perror("Logfile header write");
goto return_succp; goto return_succp;
} }
#endif #endif
@ -1757,11 +1757,11 @@ static bool file_write_footer(
if (wbytes1 != 1 || wbytes3 != 1 || wbytes4 != 1) if (wbytes1 != 1 || wbytes3 != 1 || wbytes4 != 1)
{ {
fprintf(stderr, fprintf(stderr,
"* Writing header %s %s to %s failed.\n", "\nError : Writing header %s %s to %s failed.\n",
header_buf1, header_buf1,
header_buf3, header_buf3,
header_buf4); header_buf4);
perror("Logfile header write.\n"); perror("Logfile header write");
goto return_succp; goto return_succp;
} }
#endif #endif
@ -1875,7 +1875,7 @@ skygw_file_t* skygw_file_init(
int eno = errno; int eno = errno;
errno = 0; errno = 0;
fprintf(stderr, fprintf(stderr,
"* Writing header of log file %s failed due %d, %s.\n", "\nError : Writing header of log file %s failed due %d, %s.\n",
file->sf_fname, file->sf_fname,
eno, eno,
strerror(eno)); strerror(eno));