[svn-commits] tilghman: branch tilghman/auto_preload r275767 - in /team/tilghman/auto_prelo...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jul 12 14:16:52 2010
New Revision: 275767

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275767
Log:
More load order dependencies

Modified:
    team/tilghman/auto_preload/funcs/func_curl.c
    team/tilghman/auto_preload/res/res_config_ldap.c
    team/tilghman/auto_preload/res/res_config_odbc.c
    team/tilghman/auto_preload/res/res_config_pgsql.c
    team/tilghman/auto_preload/res/res_config_sqlite.c

Modified: team/tilghman/auto_preload/funcs/func_curl.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/funcs/func_curl.c?view=diff&rev=275767&r1=275766&r2=275767
==============================================================================
--- team/tilghman/auto_preload/funcs/func_curl.c (original)
+++ team/tilghman/auto_preload/funcs/func_curl.c Mon Jul 12 14:16:52 2010
@@ -638,5 +638,10 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Load external URL");
-
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Load external URL",
+		.load = load_module,
+		.unload = unload_module,
+		.reload = reload,
+		.load_pri = AST_MODPRI_REALTIME_DEPEND + 1, /* After res_curl.so */
+	);
+

Modified: team/tilghman/auto_preload/res/res_config_ldap.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_config_ldap.c?view=diff&rev=275767&r1=275766&r2=275767
==============================================================================
--- team/tilghman/auto_preload/res/res_config_ldap.c (original)
+++ team/tilghman/auto_preload/res/res_config_ldap.c Mon Jul 12 14:16:52 2010
@@ -1778,8 +1778,9 @@
 	return CLI_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LDAP realtime interface",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "LDAP realtime interface",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
 );

Modified: team/tilghman/auto_preload/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_config_odbc.c?view=diff&rev=275767&r1=275766&r2=275767
==============================================================================
--- team/tilghman/auto_preload/res/res_config_odbc.c (original)
+++ team/tilghman/auto_preload/res/res_config_odbc.c Mon Jul 12 14:16:52 2010
@@ -1076,4 +1076,5 @@
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload_module,
+		.load_pri = AST_MODPRI_REALTIME_DRIVER,
 		);

Modified: team/tilghman/auto_preload/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_config_pgsql.c?view=diff&rev=275767&r1=275766&r2=275767
==============================================================================
--- team/tilghman/auto_preload/res/res_config_pgsql.c (original)
+++ team/tilghman/auto_preload/res/res_config_pgsql.c Mon Jul 12 14:16:52 2010
@@ -1588,8 +1588,9 @@
 }
 
 /* needs usecount semantics defined */
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL RealTime Configuration Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL RealTime Configuration Driver",
 		.load = load_module,
 		.unload = unload_module,
-		.reload = reload
+		.reload = reload,
+		.load_pri = AST_MODPRI_REALTIME_DRIVER,
 	       );

Modified: team/tilghman/auto_preload/res/res_config_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_config_sqlite.c?view=diff&rev=275767&r1=275766&r2=275767
==============================================================================
--- team/tilghman/auto_preload/res/res_config_sqlite.c (original)
+++ team/tilghman/auto_preload/res/res_config_sqlite.c Mon Jul 12 14:16:52 2010
@@ -1866,7 +1866,8 @@
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Realtime SQLite configuration",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime SQLite configuration",
 		.load = load_module,
 		.unload = unload_module,
+		.load_pri = AST_MODPRI_REALTIME_DRIVER,
 );