retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-4696 --resolve

This commit is contained in:
Jeff Lenk 2012-10-09 10:52:27 -05:00
parent 791efc74a7
commit f0941d2792
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod/applications/mod_directory/mod_directory.c
View File

@ -309,30 +309,29 @@ static int sql2str_callback(void *pArg, int argc, char **argv, char **columnName
static switch_bool_t directory_execute_sql_callback(switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata) static switch_bool_t directory_execute_sql_callback(switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata)
{ {
switch_bool_t ret = SWITCH_FALSE; switch_bool_t ret = SWITCH_FALSE;
switch_core_db_t *db; switch_cache_db_handle_t *dbh = NULL;
char *errmsg = NULL; char *errmsg = NULL;
if (mutex) { if (mutex) {
switch_mutex_lock(mutex); switch_mutex_lock(mutex);
} }
if (!(db = switch_core_db_open_file(globals.dbname))) { if (!(dbh = directory_get_db_handle())) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", globals.dbname); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB\n");
goto end; goto end;
} }
switch_core_db_exec(db, sql, callback, pdata, &errmsg); switch_cache_db_execute_sql_callback(dbh, sql, callback, pdata, &errmsg);
if (errmsg) { if (errmsg) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR: [%s] %s\n", sql, errmsg); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR: [%s] %s\n", sql, errmsg);
switch_core_db_free(errmsg); free(errmsg);
} }
if (db) {
switch_core_db_close(db);
}
end: end:
switch_cache_db_release_db_handle(&dbh);
if (mutex) { if (mutex) {
switch_mutex_unlock(mutex); switch_mutex_unlock(mutex);
} }