mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-17 00:34:13 +00:00
add support for running core-db over odbc
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15487 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
220ebe8175
commit
5d815cfdfe
18 files changed
+692
-346
No files matched your search
@@ -4008,12 +4008,14 @@ void sofia_glue_sql_close(sofia_profile_t *profile, time_t prune)
|
||||
if ((dbh = (sofia_cache_db_handle_t *) val)) {
|
||||
time_t diff = 0;
|
||||
|
||||
if (prune > 0 && prune > dbh->last_used) {
|
||||
diff = (time_t) prune - dbh->last_used;
|
||||
}
|
||||
if (prune > 0) {
|
||||
if (prune > dbh->last_used) {
|
||||
diff = (time_t) prune - dbh->last_used;
|
||||
}
|
||||
|
||||
if (diff < SQL_CACHE_TIMEOUT) {
|
||||
continue;
|
||||
if (diff < SQL_CACHE_TIMEOUT) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (switch_mutex_trylock(dbh->mutex) == SWITCH_STATUS_SUCCESS) {
|
||||
@@ -4121,7 +4123,7 @@ sofia_cache_db_handle_t *sofia_glue_get_db_handle(sofia_profile_t *profile)
|
||||
|
||||
|
||||
if (db) dbh->db = db; else dbh->odbc_dbh = odbc_dbh;
|
||||
switch_mutex_init(&dbh->mutex, SWITCH_MUTEX_NESTED, dbh->pool);
|
||||
switch_mutex_init(&dbh->mutex, 0, dbh->pool);
|
||||
switch_mutex_lock(dbh->mutex);
|
||||
|
||||
switch_core_hash_insert(profile->db_hash, thread_str, dbh);
|
||||
@@ -4202,7 +4204,7 @@ switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile,
|
||||
}
|
||||
|
||||
if (switch_odbc_available() && dbh->odbc_dbh) {
|
||||
switch_odbc_handle_callback_exec(dbh->odbc_dbh, sql, callback, pdata);
|
||||
switch_odbc_handle_callback_exec(dbh->odbc_dbh, sql, callback, pdata, NULL);
|
||||
} else if (profile->odbc_dsn) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n");
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user