[svn-commits] mmichelson: branch mmichelson/rls-config r416728 - in /team/mmichelson/rls-co...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jun 19 11:52:31 2014
New Revision: 416728

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416728
Log:
Reset the automerge property.


Modified:
    team/mmichelson/rls-config/   (props changed)
    team/mmichelson/rls-config/pbx/pbx_lua.c

Propchange: team/mmichelson/rls-config/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/rls-config/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Propchange: team/mmichelson/rls-config/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 19 11:52:31 2014
@@ -1,1 +1,1 @@
-/trunk:1-416652
+/trunk:1-416727

Modified: team/mmichelson/rls-config/pbx/pbx_lua.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/rls-config/pbx/pbx_lua.c?view=diff&rev=416728&r1=416727&r2=416728
==============================================================================
--- team/mmichelson/rls-config/pbx/pbx_lua.c (original)
+++ team/mmichelson/rls-config/pbx/pbx_lua.c Thu Jun 19 11:52:31 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,