<h1>Project "FreeSWITCH Source" received a push.</h1>

<h2>branch: master updated</h2>
<pre>
       via: 1cbb8f221b2e76ec66c72d7f09d7f6ae681764b8 (commit)
      from: ee0a0b79c87e268b3b266001bcab898544fbe4aa (commit)


</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Anthony Minessale
comments: 
supress errors caused from -nosql as reported on the mailing list and not on JIRA like it should be http://jira.freeswitch.org

<span style="color: #000080; font-weight: bold">diff --git a/src/switch_console.c b/src/switch_console.c</span>
<span style="color: #000080; font-weight: bold">index c5d601b..43a5b17 100644</span>
<span style="color: #A00000">--- a/src/switch_console.c</span>
<span style="color: #00A000">+++ b/src/switch_console.c</span>
<span style="color: #800080; font-weight: bold">@@ -1765,6 +1765,11 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string)</span>
         char *mydata = NULL, *argv[11] = { 0 };
         int argc, x;
         switch_status_t status = SWITCH_STATUS_FALSE;
<span style="color: #00A000">+        switch_core_flag_t cflags = switch_core_flags();</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+        if (!(cflags &amp; SCF_USE_SQL)) {</span>
<span style="color: #00A000">+                return SWITCH_STATUS_FALSE;</span>
<span style="color: #00A000">+        }</span>
 
         if (string &amp;&amp; (mydata = strdup(string))) {
                 if ((argc = switch_separate_string(mydata, &#39; &#39;, argv, (sizeof(argv) / sizeof(argv[0]))))) {
<span style="color: #000080; font-weight: bold">diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c</span>
<span style="color: #000080; font-weight: bold">index 2a6f9e3..8841fcc 100644</span>
<span style="color: #A00000">--- a/src/switch_core_sqldb.c</span>
<span style="color: #00A000">+++ b/src/switch_core_sqldb.c</span>
<span style="color: #800080; font-weight: bold">@@ -922,7 +922,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_db_thread(switch_thread_t *threa</span>
                         sec = 0;
                 }
 
<span style="color: #A00000">-                if (++reg_sec == SQL_REG_TIMEOUT) {</span>
<span style="color: #00A000">+                if (switch_test_flag((&amp;runtime), SCF_USE_SQL) &amp;&amp; ++reg_sec == SQL_REG_TIMEOUT) {</span>
                         switch_core_expire_registration(0);
                         reg_sec = 0;
                 }
<span style="color: #800080; font-weight: bold">@@ -1648,6 +1648,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_add_registration(const char *user, c</span>
         switch_cache_db_handle_t *dbh;
         char *sql;
 
<span style="color: #00A000">+        if (!switch_test_flag((&amp;runtime), SCF_USE_SQL)) {</span>
<span style="color: #00A000">+                return SWITCH_STATUS_FALSE;</span>
<span style="color: #00A000">+        }</span>
<span style="color: #00A000">+</span>
         if (switch_core_db_handle(&amp;dbh) != SWITCH_STATUS_SUCCESS) {
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, &quot;Error Opening DB!\n&quot;);
                 return SWITCH_STATUS_FALSE;
<span style="color: #800080; font-weight: bold">@@ -1691,6 +1695,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_del_registration(const char *user, c</span>
         switch_cache_db_handle_t *dbh;
         char *sql;
 
<span style="color: #00A000">+        if (!switch_test_flag((&amp;runtime), SCF_USE_SQL)) {</span>
<span style="color: #00A000">+                return SWITCH_STATUS_FALSE;</span>
<span style="color: #00A000">+        }</span>
<span style="color: #00A000">+</span>
         if (switch_core_db_handle(&amp;dbh) != SWITCH_STATUS_SUCCESS) {
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, &quot;Error Opening DB!\n&quot;);
                 return SWITCH_STATUS_FALSE;
<span style="color: #800080; font-weight: bold">@@ -1717,6 +1725,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_expire_registration(int force)</span>
         char *sql;
         switch_time_t now;
 
<span style="color: #00A000">+        if (!switch_test_flag((&amp;runtime), SCF_USE_SQL)) {</span>
<span style="color: #00A000">+                return SWITCH_STATUS_FALSE;</span>
<span style="color: #00A000">+        }</span>
<span style="color: #00A000">+</span>
         if (switch_core_db_handle(&amp;dbh) != SWITCH_STATUS_SUCCESS) {
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, &quot;Error Opening DB!\n&quot;);
                 return SWITCH_STATUS_FALSE;
</pre></div>
========================================================================<pre>

Summary of changes:
 src/switch_console.c    |    5 +++++
 src/switch_core_sqldb.c |   14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>