diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-07 16:43:26 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-07 16:43:26 -0600 |
commit | eeb99efead79585641f44d040b77736471ad04e2 (patch) | |
tree | 643cacac5c322a3445357f60a68b960325ae6d66 | |
parent | 5745f3489b33e37376107688117949b9aa167314 (diff) | |
parent | da1a9f392af63e483a7cf0f79e9c77fc8e95645f (diff) |
Merge "General: Silence modules on (un)load." into 13
-rw-r--r-- | pbx/pbx_lua.c | 4 | ||||
-rw-r--r-- | res/res_curl.c | 16 | ||||
-rw-r--r-- | res/res_odbc.c | 13 |
3 files changed, 5 insertions, 28 deletions
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 655d2df2e..e1f559059 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -1636,9 +1636,6 @@ static int load_or_reload_lua_stuff(void) res = AST_MODULE_LOAD_DECLINE; } - if (!res) { - ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n"); - } lua_close(L); return res; } @@ -1648,7 +1645,6 @@ static int unload_module(void) ast_context_destroy(NULL, registrar); ast_unregister_switch(&lua_switch); lua_free_extensions(); - ast_log(LOG_NOTICE, "Lua PBX Switch unloaded.\n"); return 0; } diff --git a/res/res_curl.c b/res/res_curl.c index e5eaa7d5f..aa10eff91 100644 --- a/res/res_curl.c +++ b/res/res_curl.c @@ -61,7 +61,9 @@ static int unload_module(void) /* If the dependent modules are still in memory, forbid unload */ for (i = 0; i < ARRAY_LEN(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; } } @@ -74,19 +76,9 @@ static int unload_module(void) 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) { - int res = 0; + int res = AST_MODULE_LOAD_SUCCESS; if (curl_global_init(CURL_GLOBAL_ALL)) { ast_log(LOG_ERROR, "Unable to initialize the cURL library. Cannot load res_curl.so\n"); diff --git a/res/res_odbc.c b/res/res_odbc.c index 73af22057..7395449c5 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -1068,16 +1068,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))) @@ -1086,8 +1076,7 @@ static int load_module(void) return AST_MODULE_LOAD_DECLINE; ast_cli_register_multiple(cli_odbc, ARRAY_LEN(cli_odbc)); ast_data_register_multiple(odbc_providers, ARRAY_LEN(odbc_providers)); - 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", |