{"id":810501,"url":"http://patchwork.ozlabs.org/api/patches/810501/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906104043.30745-3-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906104043.30745-3-berrange@redhat.com>","list_archive_url":null,"date":"2017-09-06T10:40:43","name":"[v1,2/2] io: include full error message in websocket handshake trace","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"28135f612463aa23c846ef967603f0705f9eb2db","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906104043.30745-3-berrange@redhat.com/mbox/","series":[{"id":1760,"url":"http://patchwork.ozlabs.org/api/series/1760/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1760","date":"2017-09-06T10:40:41","name":"Improve websockets server error reporting","version":1,"mbox":"http://patchwork.ozlabs.org/series/1760/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810501/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810501/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnKrd6jv3z9sNd\n\tfor ;\n\tWed, 6 Sep 2017 20:41:35 +1000 (AEST)","from localhost ([::1]:35319 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpXm0-0002qs-89\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 06:41:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35315)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpXlO-0002qY-Rs\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 06:40:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpXlM-0000CJ-Jx\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 06:40:54 -0400","from mx1.redhat.com ([209.132.183.28]:13065)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpXlM-0000B0-31\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 06:40:52 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2B6A581DFA;\n\tWed, 6 Sep 2017 10:40:51 +0000 (UTC)","from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 634AB835D3;\n\tWed, 6 Sep 2017 10:40:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2B6A581DFA","From":"\"Daniel P. Berrange\" ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 11:40:43 +0100","Message-Id":"<20170906104043.30745-3-berrange@redhat.com>","In-Reply-To":"<20170906104043.30745-1-berrange@redhat.com>","References":"<20170906104043.30745-1-berrange@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 06 Sep 2017 10:40:51 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v1 2/2] io: include full error message in\n\twebsocket handshake trace","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Brian Rak ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"When the websocket handshake fails it is useful to log the real\nerror message via the trace points for debugging purposes.\n\nFixes bug: #1715186\n\nSigned-off-by: Daniel P. Berrange \n---\n io/channel-websock.c | 7 ++++---\n io/trace-events | 2 +-\n 2 files changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/io/channel-websock.c b/io/channel-websock.c\nindex b9cc5a1371..463c04b0aa 100644\n--- a/io/channel-websock.c\n+++ b/io/channel-websock.c\n@@ -503,7 +503,7 @@ static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc,\n &err);\n \n if (ret < 0) {\n- trace_qio_channel_websock_handshake_fail(ioc);\n+ trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));\n qio_task_set_error(task, err);\n qio_task_complete(task);\n return FALSE;\n@@ -512,7 +512,8 @@ static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc,\n buffer_advance(&wioc->encoutput, ret);\n if (wioc->encoutput.offset == 0) {\n if (wioc->io_err) {\n- trace_qio_channel_websock_handshake_fail(ioc);\n+ trace_qio_channel_websock_handshake_fail(\n+ ioc, error_get_pretty(wioc->io_err));\n qio_task_set_error(task, wioc->io_err);\n wioc->io_err = NULL;\n qio_task_complete(task);\n@@ -543,7 +544,7 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc,\n * client connection, as most of the time we have an\n * HTTP 4xx err response to send instead\n */\n- trace_qio_channel_websock_handshake_fail(ioc);\n+ trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));\n qio_task_set_error(task, err);\n qio_task_complete(task);\n return FALSE;\ndiff --git a/io/trace-events b/io/trace-events\nindex 3d233698d0..6459f71f5b 100644\n--- a/io/trace-events\n+++ b/io/trace-events\n@@ -46,7 +46,7 @@ qio_channel_websock_new_server(void *ioc, void *master) \"Websock new client ioc=\n qio_channel_websock_handshake_start(void *ioc) \"Websock handshake start ioc=%p\"\n qio_channel_websock_handshake_pending(void *ioc, int status) \"Websock handshake pending ioc=%p status=%d\"\n qio_channel_websock_handshake_reply(void *ioc) \"Websock handshake reply ioc=%p\"\n-qio_channel_websock_handshake_fail(void *ioc) \"Websock handshake fail ioc=%p\"\n+qio_channel_websock_handshake_fail(void *ioc, const char *msg) \"Websock handshake fail ioc=%p err=%s\"\n qio_channel_websock_handshake_complete(void *ioc) \"Websock handshake complete ioc=%p\"\n \n # io/channel-command.c\n","prefixes":["v1","2/2"]}