<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 4371d3c804d890315ca623e2930286154d80a9a8 (commit)
via: 2ad81ac82f3c3c989e4d7d11f788c43c2c6f20d8 (commit)
via: 49a5effcdf2cea9e0ddcf146cf3fe85d1872e654 (commit)
from: 231a7ffaa19886653705c217a73d8e25b705503c (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Leon de Rooij
comments:
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch
</pre></div>
<div class="highlight"><pre>committer: Anthony Minessale
comments:
fix || where it should be or in sql stmt that may cause stray records in the calls table
<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 4167b4a..35311c9 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">@@ -1160,15 +1160,14 @@ static void core_event_handler(switch_event_t *event)</span>
case SWITCH_EVENT_CHANNEL_DESTROY:
{
const char *uuid = switch_event_get_header(event, "unique-id");
<span style="color: #A00000">- const char *sig = switch_event_get_header(event, "signal_bridge");</span>
if (uuid) {
new_sql() = switch_mprintf("delete from channels where uuid='%q' and hostname='%q'",
uuid, switch_core_get_variable("hostname"));
<span style="color: #A00000">- if (switch_true(sig)) {</span>
<span style="color: #A00000">- new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' || callee_uuid='%q') and hostname='%q'",</span>
<span style="color: #A00000">- uuid, uuid, switch_core_get_variable("hostname"));</span>
<span style="color: #A00000">- }</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' or callee_uuid='%q') and hostname='%q'",</span>
<span style="color: #00A000">+ uuid, uuid, switch_core_get_variable("hostname"));</span>
<span style="color: #00A000">+</span>
}
}
break;
<span style="color: #800080; font-weight: bold">@@ -1410,7 +1409,7 @@ static void core_event_handler(switch_event_t *event)</span>
}
break;
case SWITCH_EVENT_CHANNEL_UNBRIDGE:
<span style="color: #A00000">- new_sql() = switch_mprintf("delete from calls where caller_uuid='%s' and hostname='%q'",</span>
<span style="color: #00A000">+ new_sql() = switch_mprintf("delete from calls where (caller_uuid='%s' or callee_uuid='%q') and hostname='%q'",</span>
switch_event_get_header_nil(event, "caller-unique-id"), switch_core_get_variable("hostname"));
break;
case SWITCH_EVENT_SHUTDOWN:
</pre></div>
<div class="highlight"><pre>committer: Marc Olivier Chouinard
comments:
mod_callcenter: Add error response for queue load and queue reload (FS-2988)
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c</span>
<span style="color: #000080; font-weight: bold">index d1de632..61305bb 100644</span>
<span style="color: #A00000">--- a/src/mod/applications/mod_callcenter/mod_callcenter.c</span>
<span style="color: #00A000">+++ b/src/mod/applications/mod_callcenter/mod_callcenter.c</span>
<span style="color: #800080; font-weight: bold">@@ -2625,8 +2625,10 @@ SWITCH_STANDARD_API(cc_config_api_function)</span>
cc_queue_t *queue = NULL;
if ((queue = get_queue(queue_name))) {
queue_rwunlock(queue);
<span style="color: #00A000">+ stream->write_function(stream, "%s", "+OK\n");</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ stream->write_function(stream, "%s", "-ERR Invalid Queue not found!\n");</span>
}
<span style="color: #A00000">- stream->write_function(stream, "%s", "+OK\n");</span>
}
} else if (action && !strcasecmp(action, "unload")) {
if (argc-initial_argc < 1) {
<span style="color: #800080; font-weight: bold">@@ -2648,8 +2650,10 @@ SWITCH_STANDARD_API(cc_config_api_function)</span>
destroy_queue(queue_name, SWITCH_FALSE);
if ((queue = get_queue(queue_name))) {
queue_rwunlock(queue);
<span style="color: #00A000">+ stream->write_function(stream, "%s", "+OK\n");</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ stream->write_function(stream, "%s", "-ERR Invalid Queue not found!\n");</span>
}
<span style="color: #A00000">- stream->write_function(stream, "%s", "+OK\n");</span>
}
} else if (action && !strcasecmp(action, "list")) {
if (argc-initial_argc < 1) {
<span style="color: #800080; font-weight: bold">@@ -2671,7 +2675,6 @@ SWITCH_STANDARD_API(cc_config_api_function)</span>
goto done;
} else {
const char *queue_name = argv[0 + initial_argc];
<span style="color: #A00000">-</span>
struct list_result cbt;
cbt.row_process = 0;
cbt.stream = stream;
</pre></div>
========================================================================<pre>
Summary of changes:
.../applications/mod_callcenter/mod_callcenter.c | 9 ++++++---
src/switch_core_sqldb.c | 11 +++++------
2 files changed, 11 insertions(+), 9 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>