kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5664 --resolve

This commit is contained in:
Anthony Minessale 2013-08-03 18:49:55 +05:00
parent fa2530306f
commit 03dc7082b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_core_sqldb.c
View File

@ -393,6 +393,7 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_h
const char *db_name = NULL; const char *db_name = NULL;
const char *odbc_user = NULL; const char *odbc_user = NULL;
const char *odbc_pass = NULL; const char *odbc_pass = NULL;
const char *db_type = NULL;
while(runtime.max_db_handles && sql_manager.total_handles >= runtime.max_db_handles && sql_manager.total_used_handles >= sql_manager.total_handles) { while(runtime.max_db_handles && sql_manager.total_handles >= runtime.max_db_handles && sql_manager.total_used_handles >= sql_manager.total_handles) {
if (!waiting++) { if (!waiting++) {
@ -416,12 +417,14 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_h
db_name = connection_options->pgsql_options.dsn; db_name = connection_options->pgsql_options.dsn;
odbc_user = NULL; odbc_user = NULL;
odbc_pass = NULL; odbc_pass = NULL;
db_type = "pgsql";
} }
case SCDB_TYPE_ODBC: case SCDB_TYPE_ODBC:
{ {
db_name = connection_options->odbc_options.dsn; db_name = connection_options->odbc_options.dsn;
odbc_user = connection_options->odbc_options.user; odbc_user = connection_options->odbc_options.user;
odbc_pass = connection_options->odbc_options.pass; odbc_pass = connection_options->odbc_options.pass;
db_type = "odbc";
} }
break; break;
case SCDB_TYPE_CORE_DB: case SCDB_TYPE_CORE_DB:
@ -429,6 +432,7 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_h
db_name = connection_options->core_db_options.db_path; db_name = connection_options->core_db_options.db_path;
odbc_user = NULL; odbc_user = NULL;
odbc_pass = NULL; odbc_pass = NULL;
db_type = "core_db";
} }
break; break;
} }
@ -438,9 +442,9 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_h
} }
if (odbc_user || odbc_pass) { if (odbc_user || odbc_pass) {
snprintf(db_str, sizeof(db_str) - 1, "db=\"%s\";user=\"%s\";pass=\"%s\"", db_name, odbc_user, odbc_pass); snprintf(db_str, sizeof(db_str) - 1, "db=\"%s\";type=\"%s\"user=\"%s\";pass=\"%s\"", db_name, db_type, odbc_user, odbc_pass);
} else { } else {
snprintf(db_str, sizeof(db_str) - 1, "db=\"%s\"", db_name); snprintf(db_str, sizeof(db_str) - 1, "db=\"%s\",type=\"%s\"", db_name, db_type);
} }
snprintf(db_callsite_str, sizeof(db_callsite_str) - 1, "%s:%d", file, line); snprintf(db_callsite_str, sizeof(db_callsite_str) - 1, "%s:%d", file, line);
snprintf(thread_str, sizeof(thread_str) - 1, "thread=\"%lu\"", (unsigned long) (intptr_t) self); snprintf(thread_str, sizeof(thread_str) - 1, "thread=\"%lu\"", (unsigned long) (intptr_t) self);