Remove the problematic and unneeded AST_MODFLAG_GLOBAL_SYMBOLS from pbx_lua.c

AST_MODFLAG_GLOBAL_SYMBOLS was causing the module to be incorrectly loaded
before pbx_config.  pbx_config was therefore blowing away contexts that were
created by pbx_lua.  With AST_MODFLAG_DEFAULT the load order is now correct
and contexs are being properly merged.  AST_MODFLAG_GLOBAL_SYMBOLS was not
needed anyway since no other modules needed its global symbols that early.

ASTERISK-23818 #close
Reported by: Dennis Guse
Tested by: Dennis Guse
Tested by: George Joseph

Review: https://reviewboard.asterisk.org/r/3629/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@416668 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 3a33325a3bc1a66ed1e725584cd5930a2dccba21..f3cfe95aecf8d9187adc4d6fabaae07771f95a17 100644 (file)
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -1637,6 +1637,9 @@ static int load_or_reload_lua_stuff(void)
                res = AST_MODULE_LOAD_DECLINE;
        }
 
+       if (!res) {
+               ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n");
+       }
        lua_close(L);
        return res;
 }
@@ -1646,6 +1649,7 @@ static int unload_module(void)
        ast_context_destroy(NULL, registrar);
        ast_unregister_switch(&lua_switch);
        lua_free_extensions();
+       ast_log(LOG_NOTICE, "Lua PBX Switch unloaded.\n");
        return 0;
 }
 
@@ -1669,7 +1673,7 @@ static int load_module(void)
        return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
                .load = load_module,
                .unload = unload_module,
                .reload = reload,