From b4e18d5660fcc13b97cd4682ff48e33aa9d15d83 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 20 Jul 2010 19:35:02 +0000 Subject: Add load priority order, such that preload becomes unnecessary in most cases git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_adaptive_odbc.c | 3 ++- cdr/cdr_csv.c | 3 ++- cdr/cdr_custom.c | 3 ++- cdr/cdr_manager.c | 3 ++- cdr/cdr_odbc.c | 3 ++- cdr/cdr_pgsql.c | 3 ++- cdr/cdr_radius.c | 6 +++++- cdr/cdr_sqlite.c | 6 +++++- cdr/cdr_sqlite3_custom.c | 3 ++- cdr/cdr_syslog.c | 3 ++- cdr/cdr_tds.c | 3 ++- 11 files changed, 28 insertions(+), 11 deletions(-) (limited to 'cdr') diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index 50577db7e..857ad726a 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -754,9 +754,10 @@ static int reload(void) return 0; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CDR backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index a504b6b09..60b965880 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -357,8 +357,9 @@ static int reload(void) return 0; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Comma Separated Values CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Comma Separated Values CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index 684c12b46..c834814e8 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -211,9 +211,10 @@ static int reload(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index e9f728476..4cc818365 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -218,8 +218,9 @@ static int reload(void) return load_config(1); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index fde134fa8..e8a7ce828 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -279,8 +279,9 @@ static int reload(void) return odbc_load_module(1); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index b248a1e75..83c7d2e82 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -587,8 +587,9 @@ static int reload(void) return config_module(1); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index 8b611c93f..c0e2c6d2f 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -263,4 +263,8 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CDR Backend"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CDR Backend", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_CDR_DRIVER, + ); diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index d871e8a8a..a46902c9c 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -238,4 +238,8 @@ err: return AST_MODULE_LOAD_DECLINE; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SQLite CDR Backend"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite CDR Backend", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_CDR_DRIVER, +); diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index 88f577663..c2dae7a7b 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/cdr/cdr_sqlite3_custom.c @@ -354,8 +354,9 @@ static int reload(void) return res; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CDR Module", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CDR Module", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c index cc132cbf6..6d9a6df3b 100644 --- a/cdr/cdr_syslog.c +++ b/cdr/cdr_syslog.c @@ -271,8 +271,9 @@ static int reload(void) return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable syslog CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index ab0f0659c..fca815fd8 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -628,8 +628,9 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CDR Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); -- cgit v1.2.3