[Asterisk-code-review] General: Silence modules on (un)load. (asterisk[15])
Alexander Traud
asteriskteam at digium.com
Fri Jan 5 07:45:42 CST 2018
Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/7829
Change subject: General: Silence modules on (un)load.
......................................................................
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
---
M pbx/pbx_lua.c
M res/res_curl.c
M res/res_odbc.c
3 files changed, 3 insertions(+), 29 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/29/7829/1
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index fcab476..741e950 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1648,9 +1648,6 @@
}
}
- if (!res) {
- ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n");
- }
lua_close(L);
return res;
}
@@ -1660,7 +1657,6 @@
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 2551efc..0ffebc2 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -60,7 +60,6 @@
/* 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]);
res = -1;
}
}
@@ -73,19 +72,9 @@
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 7aa4524..c5979ee 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -992,7 +992,7 @@
}
AST_RWLIST_UNLOCK(&odbc_tables);
- return 0;
+ return AST_MODULE_RELOAD_SUCCESS;
}
static int unload_module(void)
@@ -1001,16 +1001,6 @@
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 @@
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",
--
To view, visit https://gerrit.asterisk.org/7829
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f105f46d72553994e820679bfde3478a551b281
Gerrit-Change-Number: 7829
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180105/da979ce7/attachment.html>
More information about the asterisk-code-review
mailing list