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

cel_pgsql: module not correctly reloading

Browse Source 
Upon reload the module unconditionally "unloaded" the module (freeing memory
and setting pointers to NULL) and then when attempting a "load" if the config
file had not changed then nothing would be reinitialized.

By moving the "unload" to occur conditionally (reload only) after an attempted
configuration load, but before module "loading" alleviates the issue. The module
now loads/unloads/reloads correctly.

(closes issue ASTERISK-22871)
Reported by: Matteo
........

Merged revisions 404857 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 404858 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 404859 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2014-01-03 22:00:42 +00:00
parent f8b55f16d2
commit 2f62394fb5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cel/cel_pgsql.c
View File

@@ -557,6 +557,10 @@ static int my_load_module(int reload)
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }
if (reload) {
my_unload_module();
}
process_my_load_module(cfg); process_my_load_module(cfg);
ast_config_destroy(cfg); ast_config_destroy(cfg);
@@ -575,7 +579,6 @@ static int load_module(void)
static int reload(void) static int reload(void)
{ {
my_unload_module();
return my_load_module(1); return my_load_module(1);
} }