diff options
Diffstat (limited to 'res/res_curl.c')
-rw-r--r-- | res/res_curl.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/res/res_curl.c b/res/res_curl.c index 4906dde77..aa10eff91 100644 --- a/res/res_curl.c +++ b/res/res_curl.c @@ -23,14 +23,14 @@ * \author Tilghman Lesher <res_curl_v1@the-tilghman.com> * * Depends on the CURL library - http://curl.haxx.se/ - * + * */ /*! \li \ref res_curl.c uses the configuration file \ref res_curl.conf * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page res_curl.conf res_curl.conf * \verbinclude res_curl.conf.sample */ @@ -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"); |