summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-04-18 14:25:47 +0000
committerKinsey Moore <kmoore@digium.com>2014-04-18 14:25:47 +0000
commit9a85fc0aa0f471fe3ea5bfa1496239044d8d8de6 (patch)
tree220c1dedc14677d46a5fbca7b46b326f98076772
parent1a9ff2fffbb8102751b20971a08df1453df60f98 (diff)
ARI: Add debug logging for events and responses
This adds DEBUG level logging for ARI websocket events and HTTP responses similar to what is available for AMI. Logging for ARI HTTP requests is already adequate for debugging purposes. ........ Merged revisions 412565 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/manager.c2
-rw-r--r--res/ari/ari_websockets.c1
-rw-r--r--res/res_ari.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c
index 5e74fb5a8..0180af8c3 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -5174,7 +5174,7 @@ static int match_filter(struct mansession *s, char *eventdata)
{
int result = 0;
- ast_debug(3, "Examining event:\n%s\n", eventdata);
+ ast_debug(3, "Examining AMI event:\n%s\n", eventdata);
if (!ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {
return 1; /* no filtering means match all */
} else if (ao2_container_count(s->session->whitefilters) && !ao2_container_count(s->session->blackfilters)) {
diff --git a/res/ari/ari_websockets.c b/res/ari/ari_websockets.c
index 20639e12e..90d6f0fdb 100644
--- a/res/ari/ari_websockets.c
+++ b/res/ari/ari_websockets.c
@@ -162,6 +162,7 @@ int ast_ari_websocket_session_write(struct ast_ari_websocket_session *session,
return -1;
}
+ ast_debug(3, "Examining ARI event: \n%s\n", str);
return ast_websocket_write(session->ws_session,
AST_WEBSOCKET_OPCODE_TEXT, str, strlen(str));
}
diff --git a/res/res_ari.c b/res/res_ari.c
index 4f16c021c..ce7027e44 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -978,6 +978,8 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
}
}
+ ast_debug(3, "Examining ARI response:\n%d %s\n%s\n%s\n", response.response_code,
+ response.response_text, ast_str_buffer(response.headers), ast_str_buffer(response_body));
ast_http_send(ser, method, response.response_code,
response.response_text, response.headers, response_body,
0, 0);