cel_pgsql: module not correctly reloading

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

diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 8db85d7..ceaa34e 100644 (file)
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -557,6 +557,10 @@ static int my_load_module(int reload)
                return AST_MODULE_LOAD_SUCCESS;
        }
 
+       if (reload) {
+               my_unload_module();
+       }
+
        process_my_load_module(cfg);
        ast_config_destroy(cfg);
 
@@ -575,7 +579,6 @@ static int load_module(void)
 
 static int reload(void)
 {
-       my_unload_module();
        return my_load_module(1);
 }