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

Some gotos removed.

Browse Source
This commit is contained in:
Johan Wikman
2015-11-03 13:52:52 +02:00
parent 2594c83117
commit 9ba6ad81b0
1 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
log_manager/log_manager.cc
View File

@ -1224,61 +1224,55 @@ static blockbuf_t* blockbuf_init(logfile_id_t id)
int skygw_log_enable(logfile_id_t id)
{
bool err = 0;
bool rval = -1;
if (!logmanager_register(true))
if (logmanager_register(true))
{
err = -1;
goto return_err;
}
CHK_LOGMANAGER(lm);
CHK_LOGMANAGER(lm);
if (logfile_set_enabled(id, true))
{
lm->lm_enabled_logfiles |= id;
/**
* Set global variable
*/
lm_enabled_logfiles_bitmask = lm->lm_enabled_logfiles;
if (logfile_set_enabled(id, true))
{
lm->lm_enabled_logfiles |= id;
/**
* Set global variable
*/
lm_enabled_logfiles_bitmask = lm->lm_enabled_logfiles;
}
logmanager_unregister();
rval = 0;
}
logmanager_unregister();
return_err:
return err;
return rval;
}
int skygw_log_disable(logfile_id_t id) /*< no locking */
{
int rc;
rc = skygw_log_disable_raw(id, false);
return rc;
return skygw_log_disable_raw(id, false);
}
static int skygw_log_disable_raw(logfile_id_t id, bool emergency) /*< no locking */
{
bool err = 0;
bool rval = -1;
if (!logmanager_register(true))
if (logmanager_register(true))
{
err = -1;
goto return_err;
}
CHK_LOGMANAGER(lm);
CHK_LOGMANAGER(lm);
if (emergency || logfile_set_enabled(id, false))
{
lm->lm_enabled_logfiles &= ~id;
/**
* Set global variable
*/
lm_enabled_logfiles_bitmask = lm->lm_enabled_logfiles;
if (emergency || logfile_set_enabled(id, false))
{
lm->lm_enabled_logfiles &= ~id;
/**
* Set global variable
*/
lm_enabled_logfiles_bitmask = lm->lm_enabled_logfiles;
}
logmanager_unregister();
rval = 0;
}
logmanager_unregister();
return_err:
return err;
return rval;
}