[asterisk-commits] gtjoseph: branch 12 r416669 - in /branches/12: ./ pbx/pbx_lua.c

[SVN commits to the Asterisk project]

Author: gtjoseph
Date: Thu Jun 19 11:03:17 2014
New Revision: 416669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416669
Log:
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/
........

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

Modified:
    branches/12/   (props changed)
    branches/12/pbx/pbx_lua.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/pbx/pbx_lua.c?view=diff&rev=416669&r1=416668&r2=416669
==============================================================================
--- branches/12/pbx/pbx_lua.c (original)
+++ branches/12/pbx/pbx_lua.c Thu Jun 19 11:03:17 2014
@@ -1636,6 +1636,9 @@
 		res = AST_MODULE_LOAD_DECLINE;
 	}
 
+	if (!res) {
+		ast_log(LOG_NOTICE, "Lua PBX Switch loaded.\n");
+	}
 	lua_close(L);
 	return res;
 }
@@ -1645,6 +1648,7 @@
 	ast_context_destroy(NULL, registrar);
 	ast_unregister_switch(&lua_switch);
 	lua_free_extensions();
+	ast_log(LOG_NOTICE, "Lua PBX Switch unloaded.\n");
 	return 0;
 }
 
@@ -1668,7 +1672,7 @@
 	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,