提交 2ad81ac8 authored 作者: Anthony Minessale's avatar Anthony Minessale

fix || where it should be or in sql stmt that may cause stray records in the calls table

上级 49a5effc
...@@ -1160,15 +1160,14 @@ static void core_event_handler(switch_event_t *event) ...@@ -1160,15 +1160,14 @@ static void core_event_handler(switch_event_t *event)
case SWITCH_EVENT_CHANNEL_DESTROY: case SWITCH_EVENT_CHANNEL_DESTROY:
{ {
const char *uuid = switch_event_get_header(event, "unique-id"); const char *uuid = switch_event_get_header(event, "unique-id");
const char *sig = switch_event_get_header(event, "signal_bridge");
if (uuid) { if (uuid) {
new_sql() = switch_mprintf("delete from channels where uuid='%q' and hostname='%q'", new_sql() = switch_mprintf("delete from channels where uuid='%q' and hostname='%q'",
uuid, switch_core_get_variable("hostname")); uuid, switch_core_get_variable("hostname"));
if (switch_true(sig)) {
new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' || callee_uuid='%q') and hostname='%q'", new_sql() = switch_mprintf("delete from calls where (caller_uuid='%q' or callee_uuid='%q') and hostname='%q'",
uuid, uuid, switch_core_get_variable("hostname")); uuid, uuid, switch_core_get_variable("hostname"));
}
} }
} }
break; break;
...@@ -1410,7 +1409,7 @@ static void core_event_handler(switch_event_t *event) ...@@ -1410,7 +1409,7 @@ static void core_event_handler(switch_event_t *event)
} }
break; break;
case SWITCH_EVENT_CHANNEL_UNBRIDGE: case SWITCH_EVENT_CHANNEL_UNBRIDGE:
new_sql() = switch_mprintf("delete from calls where caller_uuid='%s' and hostname='%q'", new_sql() = switch_mprintf("delete from calls where (caller_uuid='%s' or callee_uuid='%q') and hostname='%q'",
switch_event_get_header_nil(event, "caller-unique-id"), switch_core_get_variable("hostname")); switch_event_get_header_nil(event, "caller-unique-id"), switch_core_get_variable("hostname"));
break; break;
case SWITCH_EVENT_SHUTDOWN: case SWITCH_EVENT_SHUTDOWN:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论