diff options
| author | George Joseph <gjoseph@digium.com> | 2017-04-11 10:07:39 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-04-12 16:46:22 -0500 |
| commit | f882ca25722b6290dc6e8d786452b0b26adceed1 (patch) | |
| tree | 98f8862eaf958ea63650ca50900c0d43fce2a541 /cel | |
| parent | 2e9f186c179e86316fbe1b43fbda9702bddaa615 (diff) | |
modules: change module LOAD_FAILUREs to LOAD_DECLINES
In all non-pbx modules, AST_MODULE_LOAD_FAILURE has been changed
to AST_MODULE_LOAD_DECLINE. This prevents asterisk from exiting
if a module can't be loaded. If the user wishes to retain the
FAILURE behavior for a specific module, they can use the "require"
or "preload-require" keyword in modules.conf.
A new API was added to logger: ast_is_logger_initialized(). This
allows asterisk.c/check_init() to print to the error log once the
logger subsystem is ready instead of just to stdout. If something
does fail before the logger is initialized, we now print to stderr
instead of stdout.
Change-Id: I5f4b50623d9b5a6cb7c5624a8c5c1274c13b2b25
Diffstat (limited to 'cel')
| -rw-r--r-- | cel/cel_custom.c | 7 | ||||
| -rw-r--r-- | cel/cel_odbc.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cel/cel_custom.c b/cel/cel_custom.c index 0b2ac764f..9f480b8d7 100644 --- a/cel/cel_custom.c +++ b/cel/cel_custom.c @@ -193,14 +193,15 @@ static enum ast_module_load_result load_module(void) { if (AST_RWLIST_WRLOCK(&sinks)) { ast_log(LOG_ERROR, "Unable to lock sink list. Load failed.\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } load_config(); AST_RWLIST_UNLOCK(&sinks); if (ast_cel_backend_register(CUSTOM_BACKEND_NAME, custom_log)) { - return AST_MODULE_LOAD_FAILURE; + free_config(); + return AST_MODULE_LOAD_DECLINE; } return AST_MODULE_LOAD_SUCCESS; } @@ -209,7 +210,7 @@ static int reload(void) { if (AST_RWLIST_WRLOCK(&sinks)) { ast_log(LOG_ERROR, "Unable to lock sink list. Load failed.\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } free_config(); diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c index 701883bce..188123167 100644 --- a/cel/cel_odbc.c +++ b/cel/cel_odbc.c @@ -810,13 +810,14 @@ static int load_module(void) if (AST_RWLIST_WRLOCK(&odbc_tables)) { ast_log(LOG_ERROR, "Unable to lock column list. Load failed.\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } load_config(); AST_RWLIST_UNLOCK(&odbc_tables); if (ast_cel_backend_register(ODBC_BACKEND_NAME, odbc_log)) { ast_log(LOG_ERROR, "Unable to subscribe to CEL events\n"); - return AST_MODULE_LOAD_FAILURE; + free_config(); + return AST_MODULE_LOAD_DECLINE; } return AST_MODULE_LOAD_SUCCESS; } @@ -825,7 +826,7 @@ static int reload(void) { if (AST_RWLIST_WRLOCK(&odbc_tables)) { ast_log(LOG_ERROR, "Unable to lock column list. Reload failed.\n"); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } free_config(); |