kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10194 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-10-29 19:15:14 +00:00
parent c8681fd47b
commit 8c0fa45844
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -163,19 +163,32 @@ static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_l
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch_bool_t flush_events)
static void expire_listener(listener_t **listener)
{ {
void *pop; void *pop;
switch_thread_rwlock_unlock((*listener)->rwlock); if (listener->log_queue) {
switch_core_hash_destroy(&(*listener)->event_hash); while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {
switch_core_destroy_memory_pool(&(*listener)->pool); if (pop) free(pop);
}
}
while (switch_queue_trypop((*listener)->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { if (listener->event_queue) {
while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) {
if (!pop) continue;
switch_event_t *pevent = (switch_event_t *) pop; switch_event_t *pevent = (switch_event_t *) pop;
switch_event_destroy(&pevent); switch_event_destroy(&pevent);
} }
}
}
static void expire_listener(listener_t **listener)
{
flush_listener(*listener, SWITCH_TRUE, SWITCH_TRUE);
switch_thread_rwlock_unlock((*listener)->rwlock);
switch_core_hash_destroy(&(*listener)->event_hash);
switch_core_destroy_memory_pool(&(*listener)->pool);
*listener = NULL; *listener = NULL;
} }
@ -1310,9 +1323,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
switch_snprintf(reply, reply_len, "-ERR invalid log level"); switch_snprintf(reply, reply_len, "-ERR invalid log level");
} }
} else if (!strncasecmp(cmd, "nolog", 5)) { } else if (!strncasecmp(cmd, "nolog", 5)) {
void *pop; flush_listener(listener, SWITCH_TRUE, SWITCH_FALSE);
while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS);
if (switch_test_flag(listener, LFLAG_LOG)) { if (switch_test_flag(listener, LFLAG_LOG)) {
switch_clear_flag_locked(listener, LFLAG_LOG); switch_clear_flag_locked(listener, LFLAG_LOG);
switch_snprintf(reply, reply_len, "+OK no longer logging"); switch_snprintf(reply, reply_len, "+OK no longer logging");
@ -1434,8 +1445,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
switch_snprintf(reply, reply_len, "+OK events nixed"); switch_snprintf(reply, reply_len, "+OK events nixed");
} else if (!strncasecmp(cmd, "noevents", 8)) { } else if (!strncasecmp(cmd, "noevents", 8)) {
void *pop; flush_listener(listener, SWITCH_FALSE, SWITCH_TRUE);
while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS);
if (switch_test_flag(listener, LFLAG_EVENTS)) { if (switch_test_flag(listener, LFLAG_EVENTS)) {
uint8_t x = 0; uint8_t x = 0;
@ -1640,6 +1650,7 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");
switch_thread_rwlock_wrlock(listener->rwlock); switch_thread_rwlock_wrlock(listener->rwlock);
flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE);
if (listener->sock) { if (listener->sock) {
char disco_buf[512] = ""; char disco_buf[512] = "";