sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_odbc: Allow unload at shutdown." into 16

This commit is contained in:
Kevin Harwell 2018-08-16 17:47:40 -05:00 committed by Gerrit Code Review
parent df78227e4a b370482786
commit 80a331d96b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_odbc.c
View File

@ -996,17 +996,25 @@ static int reload(void)
static int unload_module(void)
{
/* Prohibit unloading */
return -1;
ao2_cleanup(class_container);
ast_cli_unregister_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
return 0;
}
static int load_module(void)
{
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr)))
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr))) {
return AST_MODULE_LOAD_DECLINE;
if (load_odbc_config() == -1)
}
if (load_odbc_config() == -1) {
return AST_MODULE_LOAD_DECLINE;
}
ast_module_shutdown_ref(ast_module_info->self);
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
return AST_MODULE_LOAD_SUCCESS;
}