mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Replace most uses of ast_register_atexit with ast_register_cleanup.
Since 'core stop now' and 'core restart now' do not stop modules, it is unsafe for most of the core to run cleanups. Originally all cleanups used ast_register_atexit, and were only changed when it was shown to be unsafe. ast_register_atexit is now used only when absolutely required to prevent corruption and close child processes. Exceptions that need to use ast_register_atexit: * CDR: Flush records. * res_musiconhold: Kill external applications. * AstDB: Close the DB. * canary_exit: Kill canary process. ASTERISK-24142 #close Reported by: David Brillert ASTERISK-24683 #close Reported by: Peter Katzmann ASTERISK-24805 #close Reported by: Badalian Vyacheslav ASTERISK-24881 #close Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4500/ Review: https://reviewboard.asterisk.org/r/4501/ ........ Merged revisions 433495 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 433497 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -591,10 +591,7 @@ static void manager_bridging_cleanup(void)
|
||||
{
|
||||
stasis_forward_cancel(topic_forwarder);
|
||||
topic_forwarder = NULL;
|
||||
}
|
||||
|
||||
static void manager_bridging_shutdown(void)
|
||||
{
|
||||
ast_manager_unregister("BridgeList");
|
||||
ast_manager_unregister("BridgeInfo");
|
||||
ast_manager_unregister("BridgeDestroy");
|
||||
@@ -612,7 +609,6 @@ int manager_bridging_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
ast_register_atexit(manager_bridging_shutdown);
|
||||
ast_register_cleanup(manager_bridging_cleanup);
|
||||
|
||||
manager_topic = ast_manager_get_topic();
|
||||
@@ -656,7 +652,7 @@ int manager_bridging_init(void)
|
||||
* thing and fail it.
|
||||
*/
|
||||
if (ret) {
|
||||
manager_bridging_shutdown();
|
||||
manager_bridging_cleanup();
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user