diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 19:35:02 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 19:35:02 +0000 |
commit | 771cdeecd161c957e978308048906c8ac3508717 (patch) | |
tree | 14b50e57a2595242548184d532cbeeedf416020a /cel | |
parent | a551cc79ac0419a2118ed04f54d3204e8315987c (diff) |
Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278132 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cel')
-rw-r--r-- | cel/cel_adaptive_odbc.c | 3 | ||||
-rw-r--r-- | cel/cel_custom.c | 3 | ||||
-rw-r--r-- | cel/cel_manager.c | 3 | ||||
-rw-r--r-- | cel/cel_pgsql.c | 3 | ||||
-rw-r--r-- | cel/cel_radius.c | 6 | ||||
-rw-r--r-- | cel/cel_sqlite3_custom.c | 3 | ||||
-rw-r--r-- | cel/cel_tds.c | 3 |
7 files changed, 17 insertions, 7 deletions
diff --git a/cel/cel_adaptive_odbc.c b/cel/cel_adaptive_odbc.c index cb1103df7..f5bd4a3c8 100644 --- a/cel/cel_adaptive_odbc.c +++ b/cel/cel_adaptive_odbc.c @@ -783,9 +783,10 @@ static int reload(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CEL backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CEL backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cel/cel_custom.c b/cel/cel_custom.c index 37a741935..9f7d589b4 100644 --- a/cel/cel_custom.c +++ b/cel/cel_custom.c @@ -208,9 +208,10 @@ static int reload(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CEL Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CEL Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cel/cel_manager.c b/cel/cel_manager.c index a57c31ebe..fcf20766f 100644 --- a/cel/cel_manager.c +++ b/cel/cel_manager.c @@ -168,8 +168,9 @@ static int reload(void) return load_config(1); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CEL Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CEL Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c index e4bdab1d7..32ec6302c 100644 --- a/cel/cel_pgsql.c +++ b/cel/cel_pgsql.c @@ -561,8 +561,9 @@ static int reload(void) return my_load_module(1); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CEL Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CEL Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cel/cel_radius.c b/cel/cel_radius.c index c44044f6e..0e20571d5 100644 --- a/cel/cel_radius.c +++ b/cel/cel_radius.c @@ -251,4 +251,8 @@ static int load_module(void) } } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CEL Backend"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CEL Backend", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_CDR_DRIVER, +); diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c index 94765d3e4..18e2a9f1a 100644 --- a/cel/cel_sqlite3_custom.c +++ b/cel/cel_sqlite3_custom.c @@ -357,8 +357,9 @@ static int reload(void) return res; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CEL Module", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CEL Module", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); diff --git a/cel/cel_tds.c b/cel/cel_tds.c index 631c3cb96..37992bf5e 100644 --- a/cel/cel_tds.c +++ b/cel/cel_tds.c @@ -576,8 +576,9 @@ static int unload_module(void) return tds_unload_module(); } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CEL Backend", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CEL Backend", .load = load_module, .unload = unload_module, .reload = reload, + .load_pri = AST_MODPRI_CDR_DRIVER, ); |