From 8597c55a139e33dcebfc8b299a47a08e5dec261b Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Mon, 23 Jan 2017 22:48:09 -0800 Subject: [PATCH] refactor(http): adjust debug logs --- src/http/conn.rs | 1 + src/http/h1/encode.rs | 3 ++- src/http/io.rs | 20 +++++++++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/http/conn.rs b/src/http/conn.rs index c586bd66..f3177386 100644 --- a/src/http/conn.rs +++ b/src/http/conn.rs @@ -97,6 +97,7 @@ impl Conn { other => Err(io::Error::new(io::ErrorKind::UnexpectedEof, other)), } } else { + debug!("socket read eof"); Ok(Async::Ready(None)) } }; diff --git a/src/http/h1/encode.rs b/src/http/h1/encode.rs index 606a23ff..e96dcff0 100644 --- a/src/http/h1/encode.rs +++ b/src/http/h1/encode.rs @@ -59,7 +59,8 @@ impl Encoder { } *remaining -= n as u64; - trace!("sized write complete, remaining = {}", remaining); + debug!("encoded {} bytes", n); + trace!("encode sized complete, remaining = {}", remaining); Ok(n) }, } diff --git a/src/http/io.rs b/src/http/io.rs index 53ec497d..92641a8a 100644 --- a/src/http/io.rs +++ b/src/http/io.rs @@ -126,13 +126,18 @@ impl Write for Buffered { } fn flush(&mut self) -> io::Result<()> { - self.write_buf.write_into(&mut self.io).and_then(|_n| { - if self.write_buf.remaining() == 0 { - Ok(()) - } else { - Err(io::Error::new(io::ErrorKind::WouldBlock, "wouldblock")) - } - }) + if self.write_buf.remaining() == 0 { + Ok(()) + } else { + self.write_buf.write_into(&mut self.io).and_then(|n| { + debug!("flushed {} bytes", n); + if self.write_buf.remaining() == 0 { + Ok(()) + } else { + Err(io::Error::new(io::ErrorKind::WouldBlock, "wouldblock")) + } + }) + } } } @@ -290,6 +295,7 @@ impl WriteBuf { trace!("WriteBuf reserving initial {}", init); vec.reserve(init); } else if cap < MAX_BUFFER_SIZE { + trace!("maybe_reserve MAX={}, needed={}, cap={}", MAX_BUFFER_SIZE, needed, cap); vec.reserve(cmp::min(needed, MAX_BUFFER_SIZE - cap)); trace!("WriteBuf reserved {}", vec.capacity() - cap); }