summaryrefslogtreecommitdiff
path: root/cdr
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2018-02-16 22:11:42 -0500
committerCorey Farrell <git@cfware.com>2018-03-14 05:20:12 -0400
commit572a508ef2ae7cd86e0ffd8ad6d1c5997e988c26 (patch)
treea0dcfa18f8a4a9d3e87eac3b2a7df33ac2fbcad6 /cdr
parentfee929c8acd788a77982b537953bf4053242057e (diff)
loader: Convert reload_classes to built-in modules.
* acl (named_acl.c) * cdr * cel * ccss * dnsmgr * dsp * enum * extconfig (config.c) * features * http * indications * logger * manager * plc * sounds * udptl These modules are now loaded at appropriate time by the module loader. Unlike loadable modules these use AST_MODULE_LOAD_FAILURE on error so the module loader will abort startup on failure of these modules. Some of these modules are still initialized or shutdown from outside the module loader. logger.c is initialized very early and shutdown very late, manager.c is initialized by the module loader but is shutdown by the Asterisk core (too much uses it without holding references). Change-Id: I371a9a45064f20026c492623ea8062d02a1ab97f
Diffstat (limited to 'cdr')
-rw-r--r--cdr/cdr_adaptive_odbc.c1
-rw-r--r--cdr/cdr_beanstalkd.c11
-rw-r--r--cdr/cdr_csv.c1
-rw-r--r--cdr/cdr_custom.c1
-rw-r--r--cdr/cdr_manager.c1
-rw-r--r--cdr/cdr_odbc.c1
-rw-r--r--cdr/cdr_pgsql.c1
-rw-r--r--cdr/cdr_radius.c1
-rw-r--r--cdr/cdr_sqlite.c1
-rw-r--r--cdr/cdr_sqlite3_custom.c1
-rw-r--r--cdr/cdr_syslog.c1
-rw-r--r--cdr/cdr_tds.c1
12 files changed, 17 insertions, 5 deletions
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index e04b9fec8..feb62e9fb 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -831,4 +831,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR bac
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr,res_odbc",
);
diff --git a/cdr/cdr_beanstalkd.c b/cdr/cdr_beanstalkd.c
index 8f4863aa5..524274ffb 100644
--- a/cdr/cdr_beanstalkd.c
+++ b/cdr/cdr_beanstalkd.c
@@ -261,9 +261,10 @@ static int reload(void) {
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Beanstalkd CDR Backend",
-.support_level = AST_MODULE_SUPPORT_EXTENDED,
-.load = load_module,
-.unload = unload_module,
-.reload = reload,
-.load_pri = AST_MODPRI_CDR_DRIVER,
+ .support_level = AST_MODULE_SUPPORT_EXTENDED,
+ .load = load_module,
+ .unload = unload_module,
+ .reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 5666a3d4e..e4c74ff1e 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -360,4 +360,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Comma Separated Value
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 5a5eb9ed0..72a475c8c 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -231,4 +231,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Se
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 3f0cc6b6d..74f37d207 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -371,4 +371,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Inte
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index efa68c1a9..54ca1b9e3 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -328,4 +328,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CDR Backend",
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 3af9b4b3b..a4919d57f 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -794,4 +794,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CDR Backen
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index a43e96cd8..0a5fa6371 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -287,4 +287,5 @@ 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,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index b91296073..aceff0f57 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -248,4 +248,5 @@ 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,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 2212d0499..9f71c8481 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -360,4 +360,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CDR Mo
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index bbc44064f..4f0a78ccb 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -292,4 +292,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog C
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index f3d0628ec..2de4e426a 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -635,4 +635,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CDR Backend",
.unload = unload_module,
.reload = reload,
.load_pri = AST_MODPRI_CDR_DRIVER,
+ .requires = "cdr",
);