supress errors caused from -nosql as reported on the mailing list and not on JIRA...

diff --git a/src/switch_console.c b/src/switch_console.c
index c5d601b9a2f5c7b2d6b2092eaadd97513ce9d704..43a5b17fb648d269b95182e8021af2f997691a71 100644 (file)
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -1765,6 +1765,11 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)
        char *mydata = NULL, *argv[11] = { 0 };
        int argc, x;
        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 ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 2a6f9e3bf2b4fc4a13aad897109bb5a786771843..8841fcccdb4c9bddaafb65e34c0e7630b996287a 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -922,7 +922,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_db_thread(switch_thread_t *threa
                        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);
                        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;
        char *sql;
 
+       if (!switch_test_flag((&runtime), SCF_USE_SQL)) {
+               return SWITCH_STATUS_FALSE;
+       }
+
        if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
                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;
        char *sql;
 
+       if (!switch_test_flag((&runtime), SCF_USE_SQL)) {
+               return SWITCH_STATUS_FALSE;
+       }
+
        if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
                return SWITCH_STATUS_FALSE;
@@ -1717,6 +1725,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_expire_registration(int force)
        char *sql;
        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) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
                return SWITCH_STATUS_FALSE;