refactor(lib): improve client and h1 logs
This commit is contained in:
@@ -452,7 +452,11 @@ impl ConnectingTcpRemote {
|
|||||||
loop {
|
loop {
|
||||||
if let Some(ref mut current) = self.current {
|
if let Some(ref mut current) = self.current {
|
||||||
match current.poll() {
|
match current.poll() {
|
||||||
Ok(ok) => return Ok(ok),
|
Ok(Async::Ready(tcp)) => {
|
||||||
|
debug!("connected to {:?}", tcp.peer_addr().ok());
|
||||||
|
return Ok(Async::Ready(tcp));
|
||||||
|
},
|
||||||
|
Ok(Async::NotReady) => return Ok(Async::NotReady),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
trace!("connect error {:?}", e);
|
trace!("connect error {:?}", e);
|
||||||
err = Some(e);
|
err = Some(e);
|
||||||
|
|||||||
@@ -528,6 +528,7 @@ where C: Connect + Sync + 'static,
|
|||||||
.http2_only(is_h2)
|
.http2_only(is_h2)
|
||||||
.handshake(io)
|
.handshake(io)
|
||||||
.and_then(move |(tx, conn)| {
|
.and_then(move |(tx, conn)| {
|
||||||
|
trace!("handshake complete, spawning background dispatcher task");
|
||||||
let bg = executor.execute(conn.map_err(|e| {
|
let bg = executor.execute(conn.map_err(|e| {
|
||||||
debug!("client connection error: {}", e)
|
debug!("client connection error: {}", e)
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -680,6 +680,7 @@ impl<T: Poolable> Future for Checkout<T> {
|
|||||||
impl<T> Drop for Checkout<T> {
|
impl<T> Drop for Checkout<T> {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
if self.waiter.take().is_some() {
|
if self.waiter.take().is_some() {
|
||||||
|
trace!("checkout dropped for {:?}", self.key);
|
||||||
if let Some(Ok(mut inner)) = self.pool.inner.as_ref().map(|i| i.lock()) {
|
if let Some(Ok(mut inner)) = self.pool.inner.as_ref().map(|i| i.lock()) {
|
||||||
inner.clean_waiters(&self.key);
|
inner.clean_waiters(&self.key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -231,8 +231,6 @@ where I: AsyncRead + AsyncWrite,
|
|||||||
pub fn read_keep_alive(&mut self) -> Result<(), ::Error> {
|
pub fn read_keep_alive(&mut self) -> Result<(), ::Error> {
|
||||||
debug_assert!(!self.can_read_head() && !self.can_read_body());
|
debug_assert!(!self.can_read_head() && !self.can_read_body());
|
||||||
|
|
||||||
trace!("read_keep_alive; is_mid_message={}", self.is_mid_message());
|
|
||||||
|
|
||||||
if self.is_mid_message() {
|
if self.is_mid_message() {
|
||||||
self.mid_message_detect_eof().map_err(::Error::new_io)
|
self.mid_message_detect_eof().map_err(::Error::new_io)
|
||||||
} else {
|
} else {
|
||||||
@@ -279,6 +277,7 @@ where I: AsyncRead + AsyncWrite,
|
|||||||
Err(io::Error::new(io::ErrorKind::InvalidData, desc))
|
Err(io::Error::new(io::ErrorKind::InvalidData, desc))
|
||||||
},
|
},
|
||||||
Async::NotReady => {
|
Async::NotReady => {
|
||||||
|
trace!("read_keep_alive check: ok, nothing to read yet");
|
||||||
Ok(())
|
Ok(())
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -715,14 +714,20 @@ enum Writing {
|
|||||||
|
|
||||||
impl fmt::Debug for State {
|
impl fmt::Debug for State {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
f.debug_struct("State")
|
let mut builder = f.debug_struct("State");
|
||||||
|
builder
|
||||||
.field("reading", &self.reading)
|
.field("reading", &self.reading)
|
||||||
.field("writing", &self.writing)
|
.field("writing", &self.writing)
|
||||||
.field("keep_alive", &self.keep_alive)
|
.field("keep_alive", &self.keep_alive);
|
||||||
.field("error", &self.error)
|
|
||||||
//.field("method", &self.method)
|
// Only show error field if it's interesting...
|
||||||
//.field("title_case_headers", &self.title_case_headers)
|
if let Some(ref error) = self.error {
|
||||||
.finish()
|
builder.field("error", error);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Purposefully leaving off other fields..
|
||||||
|
|
||||||
|
builder.finish()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user