| Message ID | 20170906104043.30745-3-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/06/2017 07:40 AM, Daniel P. Berrange wrote: > When the websocket handshake fails it is useful to log the real > error message via the trace points for debugging purposes. > > Fixes bug: #1715186 > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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 b9cc5a1371..463c04b0aa 100644 > --- a/io/channel-websock.c > +++ b/io/channel-websock.c > @@ -503,7 +503,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; > @@ -512,7 +512,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); > @@ -543,7 +544,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 >
diff --git a/io/channel-websock.c b/io/channel-websock.c index b9cc5a1371..463c04b0aa 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -503,7 +503,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; @@ -512,7 +512,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); @@ -543,7 +544,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
When the websocket handshake fails it is useful to log the real error message via the trace points for debugging purposes. Fixes bug: #1715186 Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- io/channel-websock.c | 7 ++++--- io/trace-events | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)