diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-13 21:22:33 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-13 21:22:33 +0000 |
commit | 607988f17b6ab703402b22502b751ebe9fa1ec3b (patch) | |
tree | 09826367dd718544b289f1484e5bb40393f8c414 /cdr/cdr_sqlite.c | |
parent | e6cf30c5ae0a9157f66d4e42e95c796a1741ea9d (diff) |
Merge changes from team/russell/sqlite:
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
SQLite3 database. (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
support for SQLite version 2. I decided that this was ok since we didn't have
any realtime support for version 3. If someone ports this to version 3, then
version 2 support can be removed or marked deprecated.
(issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.
Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality. Those are:
* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58866 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr/cdr_sqlite.c')
-rw-r--r-- | cdr/cdr_sqlite.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index bcc50aa0e..bd232b450 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -30,6 +30,8 @@ * * Creates the database and table on-the-fly * \ingroup cdr_drivers + * + * \note This module has been marked deprecated in favor for cdr_sqlite3_custom */ /*** MODULEINFO @@ -180,6 +182,9 @@ static int load_module(void) char fn[PATH_MAX]; int res; + ast_log(LOG_WARNING, "This module has been marked deprecated in favor of " + "using cdr_sqlite3_custom. (May be removed after Asterisk 1.6)\n"); + /* is the database there? */ snprintf(fn, sizeof(fn), "%s/cdr.db", ast_config_AST_LOG_DIR); db = sqlite_open(fn, AST_FILE_MODE, &zErr); |