sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_statsd.c: Made use defaults if the statsd.conf file does not exist. 

This module is an optional dependency of many modules.  If it declines to
load it then forces other modules that can optionally use this module to
also decline.

* Made use default configuration if there is a config error or the config
file does not exist.

Change-Id: If1068a582ec54ab7fb437265cb5370a97a825737
This commit is contained in:
Richard Mudgett 2018-10-02 13:29:59 -05:00
parent f066dbc353
commit c2e6efa63d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
res/res_statsd.c
View File

@ -339,9 +339,25 @@ static int load_module(void)
"", OPT_CHAR_ARRAY_T, 0,
CHARFLDSET(struct conf_global_options, prefix));
if (aco_process_config(&cfg_info, 0)) {
aco_info_destroy(&cfg_info);
return AST_MODULE_LOAD_DECLINE;
if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
struct conf *cfg;
ast_log(LOG_NOTICE, "Could not load statsd config; using defaults\n");
cfg = conf_alloc();
if (!cfg) {
aco_info_destroy(&cfg_info);
return AST_MODULE_LOAD_DECLINE;
}
if (aco_set_defaults(&global_option, "general", cfg->global)) {
ast_log(LOG_ERROR, "Failed to initialize statsd defaults.\n");
ao2_ref(cfg, -1);
aco_info_destroy(&cfg_info);
return AST_MODULE_LOAD_DECLINE;
}
ao2_global_obj_replace_unref(confs, cfg);
ao2_ref(cfg, -1);
}
if (!is_enabled()) {