mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
General: Silence modules on (un)load.
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:
committed by
Richard Mudgett
parent
09f339bda5
commit
7e9781c25e
@@ -1001,16 +1001,6 @@ static int unload_module(void)
|
||||
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)
|
||||
{
|
||||
if (!(class_container = ao2_container_alloc(1, null_hash_fn, ao2_match_by_addr)))
|
||||
@@ -1018,8 +1008,7 @@ static int load_module(void)
|
||||
if (load_odbc_config() == -1)
|
||||
return AST_MODULE_LOAD_DECLINE;
|
||||
ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc));
|
||||
ast_log(LOG_NOTICE, "res_odbc loaded.\n");
|
||||
return 0;
|
||||
return AST_MODULE_LOAD_SUCCESS;
|
||||
}
|
||||
|
||||
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "ODBC resource",
|
||||
|
Reference in New Issue
Block a user