kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-31 02:43:32 +00:00
Code Issues Projects Releases Wiki Activity

supress errors caused from -nosql as reported on the mailing list and not on JIRA like it should be http://jira.freeswitch.org

Browse Source
This commit is contained in:
Anthony Minessale 2011-02-25 21:39:37 -06:00
parent ee0a0b79c8
commit 1cbb8f221b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_console.c
View File

@ -1765,6 +1765,11 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)
char *mydata = NULL, *argv[11] = { 0 }; char *mydata = NULL, *argv[11] = { 0 };
int argc, x; int argc, x;
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
switch_core_flag_t cflags = switch_core_flags();
if (!(cflags & SCF_USE_SQL)) {
return SWITCH_STATUS_FALSE;
}
if (string && (mydata = strdup(string))) { if (string && (mydata = strdup(string))) {
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {

14
src/switch_core_sqldb.c
View File

@ -922,7 +922,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_db_thread(switch_thread_t *threa
sec = 0; sec = 0;
} }
if (++reg_sec == SQL_REG_TIMEOUT) { if (switch_test_flag((&runtime), SCF_USE_SQL) && ++reg_sec == SQL_REG_TIMEOUT) {
switch_core_expire_registration(0); switch_core_expire_registration(0);
reg_sec = 0; reg_sec = 0;
} }
@ -1648,6 +1648,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_add_registration(const char *user, c
switch_cache_db_handle_t *dbh; switch_cache_db_handle_t *dbh;
char *sql; char *sql;
if (!switch_test_flag((&runtime), SCF_USE_SQL)) {
return SWITCH_STATUS_FALSE;
}
if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) { if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -1691,6 +1695,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_del_registration(const char *user, c
switch_cache_db_handle_t *dbh; switch_cache_db_handle_t *dbh;
char *sql; char *sql;
if (!switch_test_flag((&runtime), SCF_USE_SQL)) {
return SWITCH_STATUS_FALSE;
}
if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) { if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -1717,6 +1725,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_expire_registration(int force)
char *sql; char *sql;
switch_time_t now; switch_time_t now;
if (!switch_test_flag((&runtime), SCF_USE_SQL)) {
return SWITCH_STATUS_FALSE;
}
if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) { if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;