ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

change event_socket to have more info about log lines

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10893 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-12-20 14:56:08 +00:00
parent 6ac7c18bb9
commit 236fe3d131
5 changed files with 101 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/switch_log.h
+1 -1
View File
@@ -63,7 +63,7 @@ SWITCH_BEGIN_EXTERN_C
char *content;
const char *userdata;
/* To maintain abi, only add new elements to the end of this struct and do not delete any elements */
switch_text_channel_t channel;
} switch_log_node_t;
typedef switch_status_t (*switch_log_function_t) (const switch_log_node_t *node, switch_log_level_t level);
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+48 -26
View File
@@ -134,29 +134,32 @@ static void launch_listener_thread(listener_t *listener);
static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_level_t level)
{
listener_t *l;
switch_mutex_lock(globals.listener_mutex);
for (l = listen_list.listeners; l; l = l->next) {
if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) {
char *data = strdup(node->data);
if (data) {
if (switch_queue_trypush(l->log_queue, data) == SWITCH_STATUS_SUCCESS) {
if (l->lost_logs) {
int ll = l->lost_logs;
switch_event_t *event;
l->lost_logs = 0;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll);
if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll);
switch_event_fire(&event);
}
switch_log_node_t *dnode = malloc(sizeof(*node));
switch_assert(dnode);
*dnode = *node;
dnode->data = strdup(node->data);
switch_assert(dnode->data);
if (switch_queue_trypush(l->log_queue, dnode) == SWITCH_STATUS_SUCCESS) {
if (l->lost_logs) {
int ll = l->lost_logs;
switch_event_t *event;
l->lost_logs = 0;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll);
if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll);
switch_event_fire(&event);
}
} else {
switch_safe_free(data);
l->lost_logs++;
}
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
switch_safe_free(dnode->data);
switch_safe_free(dnode);
l->lost_logs++;
}
}
}
@@ -171,7 +174,11 @@ static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch
if (listener->log_queue) {
while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {
if (pop) free(pop);
switch_log_node_t *dnode = (switch_log_node_t *) pop;
if (dnode) {
free(dnode->data);
free(dnode);
}
}
}
@@ -981,17 +988,32 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
if (!*mbuf) {
if (switch_test_flag(listener, LFLAG_LOG)) {
if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) {
char *data = (char *) pop;
if (data) {
switch_snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %" SWITCH_SSIZE_T_FMT "\n\n", strlen(data));
switch_log_node_t *dnode = (switch_log_node_t *) pop;
if (dnode->data) {
switch_snprintf(buf, sizeof(buf),
"Content-Type: log/data\n"
"Content-Length: %" SWITCH_SSIZE_T_FMT "\n"
"Log-Level: %d\n"
"Text-Channel: %d\n"
"Log-File: %s\n"
"Log-Func: %s\n"
"Log->Line: %d\n"
"\n",
strlen(dnode->data),
dnode->level,
dnode->channel,
dnode->file,
dnode->func,
dnode->line
);
len = strlen(buf);
switch_socket_send(listener->sock, buf, &len);
len = strlen(data);
switch_socket_send(listener->sock, data, &len);
len = strlen(dnode->data);
switch_socket_send(listener->sock, dnode->data, &len);
free(data);
free(dnode->data);
free(dnode);
}
do_sleep = 0;
}
src/switch_log.c
+2 -2
View File
@@ -352,7 +352,7 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
node = malloc(sizeof(*node));
switch_assert(node);
}
node->data = data;
data = NULL;
switch_set_string(node->file, filep);
@@ -361,7 +361,7 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
node->level = level;
node->content = content;
node->timestamp = now;
node->channel = channel;
if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
free(node->data);