From: Kinsey Moore <kmoore@digium.com>
Date: Fri, 18 Apr 2014 14:21:34 +0000 (+0000)
Subject: ARI: Add debug logging for events and responses
X-Git-Tag: 12.3.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b9f6459da8b6a6e9972d4da69e322af1c7b328f;p=thirdparty%2Fasterisk.git

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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@412565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index cdf98f674d..6a315f1268 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -5172,7 +5172,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 20639e12e8..90d6f0fdb3 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 4f16c021c5..ce7027e449 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);