Log: skygw_logmanager_init renamed to mxs_log_init.
skygw_logmanager_init renamed to mxs_log_init and skygw_logmanager_done renamed to mxs_log_finish. skygw_logmanager_exit removed alltogether as all it did was to call skygw_logmanager_done. That appears to have been a source for confusion as in many places a call to skygw_logmanager_done was followed by a call to skygw_logmanager_exit. In addition, the function skygw_log_done was removed from the header, since it lacked an implementation.
This commit is contained in:
@ -1081,10 +1081,7 @@ int main(int argc, char **argv)
|
||||
sigset_t sigset;
|
||||
sigset_t sigpipe_mask;
|
||||
sigset_t saved_mask;
|
||||
void (*exitfunp[4])(void) = {skygw_logmanager_exit,
|
||||
datadir_cleanup,
|
||||
write_footer,
|
||||
NULL};
|
||||
void (*exitfunp[4])(void) = { mxs_log_finish, datadir_cleanup, write_footer, NULL };
|
||||
|
||||
*syslog_enabled = 1;
|
||||
*maxscalelog_enabled = 1;
|
||||
@ -1719,7 +1716,7 @@ int main(int argc, char **argv)
|
||||
logmanager_enable_syslog(*syslog_enabled);
|
||||
logmanager_enable_maxscalelog(*maxscalelog_enabled);
|
||||
|
||||
succp = skygw_logmanager_init(NULL, get_logdir(), log_target);
|
||||
succp = mxs_log_init(NULL, get_logdir(), log_target);
|
||||
|
||||
if (!succp)
|
||||
{
|
||||
|
||||
@ -48,7 +48,7 @@ int main(int argc, char **argv)
|
||||
keyfile = argv[1];
|
||||
}
|
||||
|
||||
skygw_logmanager_init(NULL, NULL, LOG_TARGET_DEFAULT);
|
||||
mxs_log_init(NULL, NULL, LOG_TARGET_DEFAULT);
|
||||
|
||||
if (secrets_writeKeys(keyfile))
|
||||
{
|
||||
@ -57,7 +57,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
skygw_log_sync_all();
|
||||
skygw_logmanager_done();
|
||||
mxs_log_finish();
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ main(int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
skygw_logmanager_init(NULL, NULL, LOG_TARGET_DEFAULT);
|
||||
mxs_log_init(NULL, NULL, LOG_TARGET_DEFAULT);
|
||||
|
||||
pw = calloc(81, sizeof(char));
|
||||
|
||||
@ -75,6 +75,6 @@ main(int argc, char **argv)
|
||||
|
||||
free(pw);
|
||||
skygw_log_sync_all();
|
||||
skygw_logmanager_done();
|
||||
mxs_log_finish();
|
||||
return rval;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user