From a3637d5f73be47ab5e90fb1581103332612fe8cf Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Sat, 9 May 2015 22:18:05 -0700 Subject: [PATCH] refactor(all): adjust some logging --- src/buffer.rs | 2 ++ src/client/mod.rs | 6 ++---- src/client/pool.rs | 1 + src/client/response.rs | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/buffer.rs b/src/buffer.rs index ee85c373..f2f1714a 100644 --- a/src/buffer.rs +++ b/src/buffer.rs @@ -53,11 +53,13 @@ impl BufReader { pub fn read_into_buf(&mut self) -> io::Result { self.maybe_reserve(); let v = &mut self.buf; + trace!("read_into_buf pos={}, cap={}", self.cap, v.capacity()); if self.cap < v.capacity() { let nread = try!(self.inner.read(&mut v[self.cap..])); self.cap += nread; Ok(nread) } else { + trace!("read_into_buf at full capacity"); Ok(0) } } diff --git a/src/client/mod.rs b/src/client/mod.rs index 4d1a5be4..1a28ab6a 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -237,7 +237,7 @@ impl<'a, U: IntoUrl> RequestBuilder<'a, U> { if res.status.class() != Redirection { return Ok(res) } - debug!("redirect code {:?} for {:?}", res.status, url); + debug!("redirect code {:?} for {}", res.status, url); let loc = { // punching borrowck here @@ -257,9 +257,7 @@ impl<'a, U: IntoUrl> RequestBuilder<'a, U> { } }; url = match loc { - Ok(u) => { - inspect!("Location", u) - }, + Ok(u) => u, Err(e) => { debug!("Location header had invalid URI: {:?}", e); return Ok(res); diff --git a/src/client/pool.rs b/src/client/pool.rs index 0f570cc3..d6fb31f9 100644 --- a/src/client/pool.rs +++ b/src/client/pool.rs @@ -104,6 +104,7 @@ impl, S: NetworkStream + Send> NetworkConnector fo let mut should_remove = false; let conn = match locked.conns.get_mut(&key) { Some(ref mut vec) => { + trace!("Pool had connection, using"); should_remove = vec.len() == 1; vec.pop().unwrap() } diff --git a/src/client/response.rs b/src/client/response.rs index 77ded4f3..41708158 100644 --- a/src/client/response.rs +++ b/src/client/response.rs @@ -32,6 +32,7 @@ impl Response { /// Creates a new response from a server. pub fn new(stream: Box) -> ::Result { + trace!("Response::new"); let mut stream = BufReader::new(stream); let head = try!(http::parse_response(&mut stream));