[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 02/11] io: include full error message in websocket
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 02/11] io: include full error message in websocket handshake trace |
Date: |
Wed, 4 Oct 2017 13:25:06 +0100 |
When the websocket handshake fails it is useful to log the real
error message via the trace points for debugging purposes.
Fixes bug: #1715186
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-websock.c | 7 ++++---
io/trace-events | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index f5fac5b422..6ddcec1549 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -507,7 +507,7 @@ static gboolean
qio_channel_websock_handshake_send(QIOChannel *ioc,
&err);
if (ret < 0) {
- trace_qio_channel_websock_handshake_fail(ioc);
+ trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));
qio_task_set_error(task, err);
qio_task_complete(task);
return FALSE;
@@ -516,7 +516,8 @@ static gboolean
qio_channel_websock_handshake_send(QIOChannel *ioc,
buffer_advance(&wioc->encoutput, ret);
if (wioc->encoutput.offset == 0) {
if (wioc->io_err) {
- trace_qio_channel_websock_handshake_fail(ioc);
+ trace_qio_channel_websock_handshake_fail(
+ ioc, error_get_pretty(wioc->io_err));
qio_task_set_error(task, wioc->io_err);
wioc->io_err = NULL;
qio_task_complete(task);
@@ -547,7 +548,7 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel
*ioc,
* client connection, as most of the time we have an
* HTTP 4xx err response to send instead
*/
- trace_qio_channel_websock_handshake_fail(ioc);
+ trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));
qio_task_set_error(task, err);
qio_task_complete(task);
return FALSE;
diff --git a/io/trace-events b/io/trace-events
index 3d233698d0..6459f71f5b 100644
--- a/io/trace-events
+++ b/io/trace-events
@@ -46,7 +46,7 @@ qio_channel_websock_new_server(void *ioc, void *master)
"Websock new client ioc=
qio_channel_websock_handshake_start(void *ioc) "Websock handshake start ioc=%p"
qio_channel_websock_handshake_pending(void *ioc, int status) "Websock
handshake pending ioc=%p status=%d"
qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply ioc=%p"
-qio_channel_websock_handshake_fail(void *ioc) "Websock handshake fail ioc=%p"
+qio_channel_websock_handshake_fail(void *ioc, const char *msg) "Websock
handshake fail ioc=%p err=%s"
qio_channel_websock_handshake_complete(void *ioc) "Websock handshake complete
ioc=%p"
# io/channel-command.c
--
2.13.5
- [Qemu-devel] [PULL v1 00/11] Merge qio 2017/10/04, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 02/11] io: include full error message in websocket handshake trace,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 03/11] io: use case insensitive check for Connection & Upgrade websock headers, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 04/11] ui: Always remove an old VNC channel watch before adding a new one, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 01/11] io: send proper HTTP response for websocket errors, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 05/11] io: Small updates in preparation for websocket changes, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 08/11] io: Ignore websocket PING and PONG frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 06/11] io: Add support for fragmented websocket binary frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 07/11] io: Allow empty websocket payload, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 09/11] io: Reply to ping frames, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 10/11] io: Attempt to send websocket close messages to client, Daniel P. Berrange, 2017/10/04
- [Qemu-devel] [PULL v1 11/11] io: add trace events for websockets frame handling, Daniel P. Berrange, 2017/10/04