From a5e9c4e9b2faf10aef7635879e2a5cce1be9119b Mon Sep 17 00:00:00 2001
From: Matt Jordan <mjordan@digium.com>
Date: Fri, 26 Jun 2015 22:02:42 -0500
Subject: [PATCH] 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
---
res/res_corosync.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/res/res_corosync.c b/res/res_corosync.c
index e2b0596d1e..72da3f129d 100644
--- a/res/res_corosync.c
+++ b/res/res_corosync.c
@@ -863,7 +863,6 @@ static void cleanup_module(void)
static int load_module(void)
{
cs_error_t cs_err;
- enum ast_module_load_result res = AST_MODULE_LOAD_FAILURE;
struct cpg_name name;
corosync_aggregate_topic = stasis_topic_create("corosync_aggregate_topic");
@@ -885,7 +884,6 @@ static int load_module(void)
if (load_config(0)) {
/* simply not configured is not a fatal error */
- res = AST_MODULE_LOAD_DECLINE;
goto failed;
}
@@ -926,7 +924,7 @@ static int load_module(void)
failed:
cleanup_module();
- return res;
+ return AST_MODULE_LOAD_DECLINE;
}
static int unload_module(void)
--
GitLab