提交 59231cde authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-5747 move reloadxml event outside of mutex

上级 e1e13a7f
......@@ -2244,6 +2244,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_set_open_root_function(switch_xml_ope
SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err)
{
switch_xml_t root = NULL;
switch_event_t *event;
switch_mutex_lock(XML_LOCK);
......@@ -2252,6 +2253,15 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **e
}
switch_mutex_unlock(XML_LOCK);
if (root) {
if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) {
if (switch_event_fire(&event) != SWITCH_STATUS_SUCCESS) {
switch_event_destroy(&event);
}
}
}
return root;
}
......@@ -2288,12 +2298,6 @@ SWITCH_DECLARE_NONSTD(switch_xml_t) __switch_xml_open_root(uint8_t reload, const
}
if (errcnt == 0) {
switch_event_t *event;
if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) {
if (switch_event_fire(&event) != SWITCH_STATUS_SUCCESS) {
switch_event_destroy(&event);
}
}
r = switch_xml_root();
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论