Skip to content
Snippets Groups Projects
Commit a5e9c4e9 authored by Matt Jordan's avatar Matt Jordan
Browse files

res/res_corosync: Always decline module load, instead of failing

Returns a 'failure' from the module load routine indicates to Asterisk
that it should abort loading completely. This is rarely - in fact,
really, never - a good option. Aborting load of Asterisk from a dynamic
module implies that the core, and the rest of the dynamic modules, don't
matter: we should abandon all processing.

res_corosync is really not that important.

This patch updates the module such that, if it fails to load, it
politely declines (emitting ERROR messages along the way), and allows
Asterisk to continue to function.

Note that this issue was keeping Asterisk unit tests from running on
certain build agents.

Change-Id: I252249e81fb9b1a68e0da873f54f47e21d648f0f
parent 0ec461a6
No related branches found
No related tags found
No related merge requests found
...@@ -863,7 +863,6 @@ static void cleanup_module(void) ...@@ -863,7 +863,6 @@ static void cleanup_module(void)
static int load_module(void) static int load_module(void)
{ {
cs_error_t cs_err; cs_error_t cs_err;
enum ast_module_load_result res = AST_MODULE_LOAD_FAILURE;
struct cpg_name name; struct cpg_name name;
corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic"); corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic");
...@@ -885,7 +884,6 @@ static int load_module(void) ...@@ -885,7 +884,6 @@ static int load_module(void)
if (load_config(0)) { if (load_config(0)) {
/* simply not configured is not a fatal error */ /* simply not configured is not a fatal error */
res = AST_MODULE_LOAD_DECLINE;
goto failed; goto failed;
} }
...@@ -926,7 +924,7 @@ static int load_module(void) ...@@ -926,7 +924,7 @@ static int load_module(void)
failed: failed:
cleanup_module(); cleanup_module();
return res; return AST_MODULE_LOAD_DECLINE;
} }
static int unload_module(void) static int unload_module(void)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment