From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 22 Aug 2013 20:29:15 +0000 (+0000)
Subject: Ensure CEL creates a default config if it isn't provided with one
X-Git-Tag: 13.0.0-beta1~1221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24683444ac07743e202c6f6cae0364ee4057df4c;p=thirdparty%2Fasterisk.git

Ensure CEL creates a default config if it isn't provided with one

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/cel.c b/main/cel.c
index 1b2dc39143..e063fab9bf 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -1474,7 +1474,21 @@ int ast_cel_engine_init(void)
 	aco_option_register_custom(&cel_cfg_info, "apps", ACO_EXACT, general_options, "", apps_handler, 0);
 	aco_option_register_custom(&cel_cfg_info, "events", ACO_EXACT, general_options, "", events_handler, 0);
 
-	aco_process_config(&cel_cfg_info, 0);
+	if (aco_process_config(&cel_cfg_info, 0)) {
+		RAII_VAR(struct cel_config *, cel_cfg, cel_config_alloc(), ao2_cleanup);
+
+		if (!cel_cfg) {
+			return -1;
+		}
+
+		/* If we couldn't process the configuration and this wasn't a reload,
+		 * create a default config
+		 */
+		if (!aco_set_defaults(&general_option, "general", cel_cfg->general)) {
+			ast_log(LOG_NOTICE, "Failed to process CEL configuration; using defaults\n");
+			ao2_global_obj_replace(cel_configs, cel_cfg);
+		}
+	}
 
 	ast_register_cleanup(ast_cel_engine_term);