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

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source 
Conflicts:
	log_manager/log_manager.cc
This commit is contained in:
VilhoRaatikka
2014-11-12 14:59:36 +02:00
parent 780733f870 624c347984
commit f4576dbabc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
log_manager/log_manager.cc
View File

@ -1446,9 +1446,11 @@ int skygw_log_rotate(
logfile_id_t id) logfile_id_t id)
{ {
int err = 0; int err = 0;
va_list valist; /**< Dummy, must be present but it is not processed */ va_list valist; /**< Dummy, must be present but it is not processed */
if (!logmanager_register(false)) { if (!logmanager_register(false)) {
ss_dfprintf(stderr, ss_dfprintf(stderr,
"Can't register to logmanager, rotating failed\n"); "Can't register to logmanager, rotating failed\n");
@ -1464,7 +1466,9 @@ int skygw_log_rotate(
return_unregister: return_unregister:
logmanager_unregister(); logmanager_unregister();
return_err:
return_err:
return err; return err;
} }