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

diff --git a/main/manager.c b/main/manager.c
index 5e74fb5a899294f04f47f25e99454c4f09ed91f2..0180af8c32077fb660e6b99ffa8d61b552c2cb21 100644 (file)
--- 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 20639e12e8c13b980577899103de155c82ea8479..90d6f0fdb3f49483c444a39ae5452187ae758d53 100644 (file)
--- 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 4f16c021c5fb64a760ed93752ef347d4e10ac301..ce7027e44974664f2416594e8da47e5198e95911 100644 (file)
--- 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);