mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
Address unload order issues for res_stasis* modules
I've noticed when doing a graceful shutdown that the res_stasis_http.so module gets unloaded before the modules that use it, which causes some asserts during their unload. While r386928 was a quick hack to get it to not assert and die, this patch increases the use counts on res_stasis.so and res_stasis_http.so properly. It's a bigger change than I expected, hence the review instead of just committing it. Review: https://reviewboard.asterisk.org/r/2489/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -525,6 +525,7 @@ void ast_module_shutdown(void)
|
||||
}
|
||||
AST_LIST_REMOVE_CURRENT(entry);
|
||||
if (mod->flags.running && !mod->flags.declined && mod->info->unload) {
|
||||
ast_verb(1, "Unloading %s\n", mod->resource);
|
||||
mod->info->unload();
|
||||
}
|
||||
AST_LIST_HEAD_DESTROY(&mod->users);
|
||||
@@ -571,6 +572,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
|
||||
/* Request any channels attached to the module to hangup. */
|
||||
__ast_module_user_hangup_all(mod);
|
||||
|
||||
ast_verb(1, "Unloading %s\n", mod->resource);
|
||||
res = mod->info->unload();
|
||||
if (res) {
|
||||
ast_log(LOG_WARNING, "Firm unload failed for %s\n", resource_name);
|
||||
|
Reference in New Issue
Block a user