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

Merge "res_statsd.c: Fix returned reload status." into 13

Browse Source
This commit is contained in:
George Joseph
2018-10-15 10:31:18 -05:00
committed by Gerrit Code Review
parent c4b979a841 ccdb53a1ca
commit fb33300123
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/res_statsd.c
View File

@@ -318,6 +318,14 @@ static void statsd_shutdown(void)
} }
} }
static int unload_module(void)
{
statsd_shutdown();
aco_info_destroy(&cfg_info);
ao2_global_obj_release(confs);
return 0;
}
static int load_module(void) static int load_module(void)
{ {
if (aco_info_init(&cfg_info)) { if (aco_info_init(&cfg_info)) {
@@ -350,8 +358,8 @@ static int load_module(void)
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }
if (statsd_init() != 0) { if (statsd_init()) {
aco_info_destroy(&cfg_info); unload_module();
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
@@ -361,26 +369,26 @@ static int load_module(void)
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }
static int unload_module(void)
{
statsd_shutdown();
aco_info_destroy(&cfg_info);
ao2_global_obj_release(confs);
return 0;
}
static int reload_module(void) static int reload_module(void)
{ {
if (aco_process_config(&cfg_info, 1)) { switch (aco_process_config(&cfg_info, 1)) {
case ACO_PROCESS_OK:
break;
case ACO_PROCESS_UNCHANGED:
return AST_MODULE_LOAD_SUCCESS;
case ACO_PROCESS_ERROR:
default:
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
if (is_enabled()) { if (is_enabled()) {
return statsd_init(); if (statsd_init()) {
return AST_MODULE_LOAD_DECLINE;
}
} else { } else {
statsd_shutdown(); statsd_shutdown();
return AST_MODULE_LOAD_SUCCESS;
} }
return AST_MODULE_LOAD_SUCCESS;
} }
/* The priority of this module is set to be as low as possible, since it could /* The priority of this module is set to be as low as possible, since it could