From 39c2c1fc580081bec56925c9d0c8984f1ff49b34 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 3 Feb 2021 00:49:18 -0800 Subject: [PATCH] ircd::resource: Improve log msg clarity; label branch. --- ircd/resource.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ircd/resource.cc b/ircd/resource.cc index 04330b9ca..f33583161 100644 --- a/ircd/resource.cc +++ b/ircd/resource.cc @@ -1265,10 +1265,10 @@ ircd::resource::response::response(client &client, "HTTP headers too large for buffer of %zu", sizeof(head_buf) }; - size_t wrote{0}; + size_t wrote_head {0}; std::exception_ptr eptr; try { - wrote = client.write_all(head.completed()); + wrote_head += client.write_all(head.completed()); } catch(...) { @@ -1284,7 +1284,7 @@ ircd::resource::response::response(client &client, log::logf { log, level, - "%s HTTP %u `%s' %s in %s; %s content-length:%s wrote:%zu %s%s", + "%s HTTP %u `%s' %s in %s; %s content-length:%s head-length:%zu %s%s", client.loghead(), uint(code), client.request.head.path, @@ -1294,7 +1294,7 @@ ircd::resource::response::response(client &client, ssize_t(content_length) >= 0? lex_cast(content_length): "chunked"_sv, - wrote, + wrote_head, eptr? "error:"_sv: string_view{}, @@ -1302,10 +1302,10 @@ ircd::resource::response::response(client &client, }; #endif - if(eptr) + if(unlikely(eptr)) std::rethrow_exception(eptr); - assert(wrote == size(head.completed())); + assert(wrote_head == size(head.completed())); } ///////////////////////////////////////////////////////////////////////////////