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

skygw_log_flush no longer calls logmanager_write_log.

Browse Source
This commit is contained in:
Johan Wikman
2015-10-30 15:26:10 +02:00
parent 217a0ae406
commit 3da1769d12
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
log_manager/log_manager.cc
View File

@ -1567,28 +1567,28 @@ int skygw_log_write_context(logfile_id_t id,
int skygw_log_flush(logfile_id_t id) int skygw_log_flush(logfile_id_t id)
{ {
int err = 0; int err = -1;
if (!logmanager_register(false)) if (logmanager_register(false))
{ {
ss_dfprintf(stderr, CHK_LOGMANAGER(lm);
"Can't register to logmanager, nothing to flush\n");
goto return_err; if (logmanager_is_valid_id(id))
{
logfile_t *lf = logmanager_get_logfile(lm, id);
CHK_LOGFILE(lf);
logfile_flush(lf);
err = 0;
}
logmanager_unregister();
} }
CHK_LOGMANAGER(lm); else
err = logmanager_write_log(id,
LOG_FLUSH_YES,
0, 0, NULL);
if (err != 0)
{ {
fprintf(stderr, "skygw_log_flush failed.\n"); ss_dfprintf(stderr, "Can't register to logmanager, flushing failed.\n");
goto return_unregister;
} }
return_unregister:
logmanager_unregister();
return_err:
return err; return err;
} }