ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-09 21:14:02 +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
libs/esl/fs_cli.c
+29 -24
View File
@@ -71,30 +71,34 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
if (handle->last_event) {
const char *type = esl_event_get_header(handle->last_event, "content-type");
if (!strcasecmp(type, "log/data")) {
int level = 0;
if (strstr(handle->last_event->body, "[CONSOLE]")) {
level = 0;
} else if (strstr(handle->last_event->body, "[ALERT]")) {
level = 1;
} else if (strstr(handle->last_event->body, "[CRIT]")) {
level = 2;
} else if (strstr(handle->last_event->body, "[ERROR]")) {
level = 3;
} else if (strstr(handle->last_event->body, "[WARNING]")) {
level = 4;
} else if (strstr(handle->last_event->body, "[NOTICE]")) {
level = 5;
} else if (strstr(handle->last_event->body, "[INFO]")) {
level = 6;
} else if (strstr(handle->last_event->body, "[DEBUG]")) {
level = 7;
}
int known = 0;
printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR);
} else if (0 && !strcasecmp(type, "text/disconnect-notice")) {
running = thread_running = 0;
} else {
if (!esl_strlen_zero(type)) {
if (!strcasecmp(type, "log/data")) {
int level = 0, tchannel = 0;
const char *lname = esl_event_get_header(handle->last_event, "log-level");
const char *channel = esl_event_get_header(handle->last_event, "text-channel");
const char *file = esl_event_get_header(handle->last_event, "log-file");
if (channel) {
tchannel = atoi(channel);
}
if (lname) {
level = atoi(lname);
}
if (tchannel == 0 || (file && !strcmp(file, "switch_console.c"))) {
printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR);
}
known++;
} else if (!strcasecmp(type, "text/disconnect-notice")) {
running = thread_running = 0;
known++;
}
}
if (!known) {
printf("INCOMING DATA [%s]\n%s", type, handle->last_event->body);
}
}
@@ -108,6 +112,7 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
done:
thread_running = 0;
esl_log(ESL_LOG_DEBUG, "Thread Done\n");
return NULL;
}
@@ -181,7 +186,7 @@ int main(int argc, char *argv[])
signal(SIGINT, handle_SIGINT);
gethostname(hostname, sizeof(hostname));
handle.debug = 0;
handle.debug = 1;
if (esl_config_open_file(&cfg, cfile)) {
libs/esl/src/esl.c
+21 -1
View File
@@ -446,7 +446,6 @@ esl_status_t esl_recv(esl_handle_t *handle)
rrval = recv(handle->sock, c, 1, 0);
if (rrval == 0) {
if (++zc >= 100) {
esl_disconnect(handle);
return ESL_FAIL;
@@ -588,6 +587,27 @@ esl_status_t esl_recv(esl_handle_t *handle)
free(body);
if ((cl = esl_event_get_header(handle->last_ievent, "content-length"))) {
esl_ssize_t sofar = 0;
len = atol(cl);
body = malloc(len+1);
esl_assert(body);
*(body + len) = '\0';
do {
esl_ssize_t r;
if ((r = recv(handle->sock, body + sofar, len - sofar, 0)) < 0) {
strerror_r(handle->errno, handle->err, sizeof(handle->err));
goto fail;
}
sofar += r;
} while (sofar < len);
handle->last_ievent->body = body;
}
if (handle->debug) {
char *foo;
esl_event_serialize(handle->last_ievent, &foo, ESL_FALSE);