kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

General: Silence modules on (un)load.

Browse Source 
Some (normally optional) modules created notices, warnings, and even errors
in normal situations like (un)load. This cluttered the command-line interface
(CLI) on start and while stopping gracefully. However, when an user went for
the script './contrib/scripts/install_prereq', those modules get compiled-in
because their prerequisites were met at compile time. Furthermore, because of
ASTERISK_27475, the former talkative module 'res_curl' is built as side-effect.

ASTERISK-27553

Change-Id: I9f105f46d72553994e820679bfde3478a551b281
This commit is contained in:
Alexander Traud
2018-01-05 14:58:32 +01:00
committed by Richard Mudgett
parent b8271826b3
commit da1a9f392a
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pbx/pbx_lua.c
View File

@@ -1636,9 +1636,6 @@ static int load_or_reload_lua_stuff(void)
res = AST_MODULE_LOAD_DECLINE; res = AST_MODULE_LOAD_DECLINE;
} }
if (!res) {
ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n");
}
lua_close(L); lua_close(L);
return res; return res;
} }
@@ -1648,7 +1645,6 @@ static int unload_module(void)
ast_context_destroy(NULL, registrar); ast_context_destroy(NULL, registrar);
ast_unregister_switch(&lua_switch); ast_unregister_switch(&lua_switch);
lua_free_extensions(); lua_free_extensions();
ast_log(LOG_NOTICE, "Lua PBX Switch unloaded.\n");
return 0; return 0;
} }

16
res/res_curl.c
View File

@@ -61,7 +61,9 @@ static int unload_module(void)
/* If the dependent modules are still in memory, forbid unload */ /* If the dependent modules are still in memory, forbid unload */
for (i = 0; i < ARRAY_LEN(dependents); i++) { for (i = 0; i < ARRAY_LEN(dependents); i++) {
if (ast_module_check(dependents[i])) { if (ast_module_check(dependents[i])) {
ast_log(LOG_ERROR, "%s (dependent module) is still loaded. Cannot unload res_curl.so\n", dependents[i]); if (!ast_shutting_down()) {
ast_log(LOG_WARNING, "%s (dependent module) is still loaded. Cannot unload res_curl.so\n", dependents[i]);
}
res = -1; res = -1;
} }
} }
@@ -74,19 +76,9 @@ static int unload_module(void)
return res; return res;
} }
/*!
* \brief Load the module
*
* Module loading including tests for configuration or dependencies.
* This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
* or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
* tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
* configuration file or other non-critical problem return
* AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
*/
static int load_module(void) static int load_module(void)
{ {
int res = 0; int res = AST_MODULE_LOAD_SUCCESS;
if (curl_global_init(CURL_GLOBAL_ALL)) { if (curl_global_init(CURL_GLOBAL_ALL)) {
ast_log(LOG_ERROR, "Unable to initialize the cURL library. Cannot load res_curl.so\n"); ast_log(LOG_ERROR, "Unable to initialize the cURL library. Cannot load res_curl.so\n");

13
res/res_odbc.c
View File

@@ -1068,16 +1068,6 @@ static int unload_module(void)
return -1; return -1;
} }
/*!
* \brief Load the module
*
* Module loading including tests for configuration or dependencies.
* This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
* or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
* tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
* configuration file or other non-critical problem return
* AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
*/
static int load_module(void) 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)))
@@ -1086,8 +1076,7 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc)); ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
ast_data_register_multiple(odbc_providers, ARRAY_LEN(odbc_providers)); ast_data_register_multiple(odbc_providers, ARRAY_LEN(odbc_providers));
ast_log(LOG_NOTICE, "res_odbc loaded.\n"); return AST_MODULE_LOAD_SUCCESS;
return 0;
} }
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource", AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",