kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
George Joseph
2018-10-05 10:10:28 -05:00
committed by Gerrit Code Review
parent 4b90cb1cd0 a69a50b6ec
commit 9549511731
1 changed files with 19 additions and 3 deletions
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, "", OPT_CHAR_ARRAY_T, 0,
CHARFLDSET(struct conf_global_options, prefix)); CHARFLDSET(struct conf_global_options, prefix));
if (aco_process_config(&cfg_info, 0)) { if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
aco_info_destroy(&cfg_info); struct conf *cfg;
return AST_MODULE_LOAD_DECLINE;
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()) { if (!is_enabled()) {