Skip to content

Commit 207fca6

Browse files
committed
fix(lib): remove logs that contain request and response data
Closes #1281
1 parent 2ea125e commit 207fca6

File tree

9 files changed

+20
-80
lines changed

9 files changed

+20
-80
lines changed

src/header/common/authorization.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ impl FromStr for Basic {
184184
password: password
185185
})
186186
},
187-
Err(e) => {
188-
debug!("Basic::from_utf8 error={:?}", e);
187+
Err(_) => {
188+
debug!("Basic::from_str utf8 error");
189189
Err(::Error::Header)
190190
}
191191
},
192-
Err(e) => {
193-
debug!("Basic::from_base64 error={:?}", e);
192+
Err(_) => {
193+
debug!("Basic::from_str base64 error");
194194
Err(::Error::Header)
195195
}
196196
}

src/header/mod.rs

-16
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,6 @@ impl<'a> fmt::Display for ValueString<'a> {
240240
}
241241
}
242242

243-
struct HeaderValueString<'a, H: Header + 'a>(&'a H);
244-
245-
impl<'a, H: Header> fmt::Debug for HeaderValueString<'a, H> {
246-
#[inline]
247-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
248-
try!(f.write_str("\""));
249-
try!(self.0.fmt_header(&mut Formatter(Multi::Join(true, f))));
250-
f.write_str("\"")
251-
}
252-
}
253-
254243
struct NewlineReplacer<'a, F: fmt::Write + 'a>(&'a mut F);
255244

256245
impl<'a, F: fmt::Write + 'a> fmt::Write for NewlineReplacer<'a, F> {
@@ -394,7 +383,6 @@ impl Headers {
394383
///
395384
/// The field is determined by the type of the value being set.
396385
pub fn set<H: Header>(&mut self, value: H) {
397-
trace!("Headers.set( {:?}, {:?} )", header_name::<H>(), HeaderValueString(&value));
398386
self.data.insert(HeaderName(Ascii::new(Cow::Borrowed(header_name::<H>()))),
399387
Item::new_typed(value));
400388
}
@@ -432,7 +420,6 @@ impl Headers {
432420
/// Note that this function may return `None` even though a header was removed. If you want to
433421
/// know whether a header exists, rather rely on `has`.
434422
pub fn remove<H: Header>(&mut self) -> Option<H> {
435-
trace!("Headers.remove( {:?} )", header_name::<H>());
436423
self.data.remove(&HeaderName(Ascii::new(Cow::Borrowed(header_name::<H>()))))
437424
.and_then(Item::into_typed::<H>)
438425
}
@@ -488,7 +475,6 @@ impl Headers {
488475
pub fn set_raw<K: Into<Cow<'static, str>>, V: Into<Raw>>(&mut self, name: K, value: V) {
489476
let name = name.into();
490477
let value = value.into();
491-
trace!("Headers.set_raw( {:?}, {:?} )", name, value);
492478
self.data.insert(HeaderName(Ascii::new(name)), Item::new_raw(value));
493479
}
494480

@@ -510,7 +496,6 @@ impl Headers {
510496
pub fn append_raw<K: Into<Cow<'static, str>>, V: Into<Raw>>(&mut self, name: K, value: V) {
511497
let name = name.into();
512498
let value = value.into();
513-
trace!("Headers.append_raw( {:?}, {:?} )", name, value);
514499
let name = HeaderName(Ascii::new(name));
515500
if let Some(item) = self.data.get_mut(&name) {
516501
item.raw_mut().push(value);
@@ -521,7 +506,6 @@ impl Headers {
521506

522507
/// Remove a header by name.
523508
pub fn remove_raw(&mut self, name: &str) {
524-
trace!("Headers.remove_raw( {:?} )", name);
525509
self.data.remove(name);
526510
}
527511

src/http/conn.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use futures::task::Task;
77
use tokio_io::{AsyncRead, AsyncWrite};
88
use tokio_proto::streaming::pipeline::{Frame, Transport};
99

10-
use http::{self, Http1Transaction, DebugTruncate};
10+
use http::{self, Http1Transaction};
1111
use http::io::{Cursor, Buffered};
1212
use http::h1::{Encoder, Decoder};
1313
use method::Method;
@@ -90,13 +90,13 @@ where I: AsyncRead + AsyncWrite,
9090
self.io.consume_leading_lines();
9191
let was_mid_parse = !self.io.read_buf().is_empty();
9292
return if was_mid_parse {
93-
debug!("parse error ({}) with bytes: {:?}", e, self.io.read_buf());
93+
debug!("parse error ({}) with {} bytes", e, self.io.read_buf().len());
9494
Ok(Async::Ready(Some(Frame::Error { error: e })))
9595
} else if must_respond_with_error {
9696
trace!("parse error with 0 input, err = {:?}", e);
9797
Ok(Async::Ready(Some(Frame::Error { error: e })))
9898
} else {
99-
debug!("socket complete");
99+
debug!("read eof");
100100
Ok(Async::Ready(None))
101101
};
102102
}
@@ -669,20 +669,19 @@ struct DebugFrame<'a, T: fmt::Debug + 'a, B: AsRef<[u8]> + 'a>(&'a Frame<http::M
669669
impl<'a, T: fmt::Debug + 'a, B: AsRef<[u8]> + 'a> fmt::Debug for DebugFrame<'a, T, B> {
670670
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
671671
match *self.0 {
672-
Frame::Message { ref message, ref body } => {
672+
Frame::Message { ref body, .. } => {
673673
f.debug_struct("Message")
674-
.field("message", message)
675674
.field("body", body)
676675
.finish()
677676
},
678677
Frame::Body { chunk: Some(ref chunk) } => {
679678
f.debug_struct("Body")
680-
.field("chunk", &DebugTruncate(chunk.as_ref()))
679+
.field("bytes", &chunk.as_ref().len())
681680
.finish()
682681
},
683682
Frame::Body { chunk: None } => {
684683
f.debug_struct("Body")
685-
.field("chunk", &None::<()>)
684+
.field("bytes", &None::<()>)
686685
.finish()
687686
},
688687
Frame::Error { ref error } => {

src/http/h1/encode.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl Encoder {
5959
}
6060
let n = {
6161
let max = cmp::min(*remaining as usize, msg.len());
62-
trace!("sized write, len = {}, remaining = {}", max, remaining);
62+
trace!("sized write = {}", max);
6363
let slice = &msg[..max];
6464

6565
try!(w.write_atomic(&[slice]))
@@ -70,8 +70,7 @@ impl Encoder {
7070
}
7171

7272
*remaining -= n as u64;
73-
debug!("encoded {} bytes", n);
74-
trace!("encode sized complete, remaining = {}", remaining);
73+
trace!("encoded {} bytes, remaining = {}", n, remaining);
7574
Ok(n)
7675
},
7776
}

src/http/h1/parse.rs

+4-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ impl Http1Transaction for ServerTransaction {
2323
if buf.len() == 0 {
2424
return Ok(None);
2525
}
26-
trace!("parse({:?})", buf);
2726
let mut headers_indices = [HeaderIndices {
2827
name: (0, 0),
2928
value: (0, 0)
@@ -34,7 +33,7 @@ impl Http1Transaction for ServerTransaction {
3433
let mut req = httparse::Request::new(&mut headers);
3534
match try!(req.parse(&buf)) {
3635
httparse::Status::Complete(len) => {
37-
trace!("httparse Complete({})", len);
36+
trace!("Request.parse Complete({})", len);
3837
let method = try!(req.method.unwrap().parse());
3938
let path = req.path.unwrap();
4039
let bytes_ptr = buf.as_ref().as_ptr() as usize;
@@ -110,11 +109,9 @@ impl Http1Transaction for ServerTransaction {
110109

111110

112111
fn encode(mut head: MessageHead<Self::Outgoing>, has_body: bool, method: &mut Option<Method>, dst: &mut Vec<u8>) -> Encoder {
113-
trace!("ServerTransaction::encode head={:?}, has_body={}, method={:?}",
114-
head, has_body, method);
112+
trace!("ServerTransaction::encode has_body={}, method={:?}", has_body, method);
115113

116114
let body = ServerTransaction::set_length(&mut head, has_body, method.as_ref());
117-
debug!("encode headers = {:?}", head.headers);
118115

119116
let init_cap = 30 + head.headers.len() * AVERAGE_HEADER_SIZE;
120117
dst.reserve(init_cap);
@@ -180,7 +177,6 @@ impl Http1Transaction for ClientTransaction {
180177
if buf.len() == 0 {
181178
return Ok(None);
182179
}
183-
trace!("parse({:?})", buf);
184180
let mut headers_indices = [HeaderIndices {
185181
name: (0, 0),
186182
value: (0, 0)
@@ -192,7 +188,7 @@ impl Http1Transaction for ClientTransaction {
192188
let bytes = buf.as_ref();
193189
match try!(res.parse(bytes)) {
194190
httparse::Status::Complete(len) => {
195-
trace!("Response.try_parse Complete({})", len);
191+
trace!("Response.parse Complete({})", len);
196192
let code = res.code.unwrap();
197193
let status = try!(StatusCode::try_from(code).map_err(|_| ::Error::Status));
198194
let reason = match status.canonical_reason() {
@@ -273,14 +269,11 @@ impl Http1Transaction for ClientTransaction {
273269
}
274270

275271
fn encode(mut head: MessageHead<Self::Outgoing>, has_body: bool, method: &mut Option<Method>, dst: &mut Vec<u8>) -> Encoder {
276-
trace!("ClientTransaction::encode head={:?}, has_body={}, method={:?}",
277-
head, has_body, method);
278-
272+
trace!("ClientTransaction::encode has_body={}, method={:?}", has_body, method);
279273

280274
*method = Some(head.subject.0.clone());
281275

282276
let body = ClientTransaction::set_length(&mut head, has_body);
283-
debug!("encode headers = {:?}", head.headers);
284277

285278
let init_cap = 30 + head.headers.len() * AVERAGE_HEADER_SIZE;
286279
dst.reserve(init_cap);

src/http/io.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ptr;
66
use futures::{Async, Poll};
77
use tokio_io::{AsyncRead, AsyncWrite};
88

9-
use http::{Http1Transaction, MessageHead, DebugTruncate};
9+
use http::{Http1Transaction, MessageHead};
1010
use bytes::{BytesMut, Bytes};
1111

1212
const INIT_BUFFER_SIZE: usize = 8192;
@@ -224,8 +224,9 @@ impl<T: AsRef<[u8]>> Cursor<T> {
224224

225225
impl<T: AsRef<[u8]>> fmt::Debug for Cursor<T> {
226226
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
227-
f.debug_tuple("Cursor")
228-
.field(&DebugTruncate(self.buf()))
227+
f.debug_struct("Cursor")
228+
.field("pos", &self.pos)
229+
.field("len", &self.bytes.as_ref().len())
229230
.finish()
230231
}
231232
}

src/http/mod.rs

-17
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,6 @@ pub trait Http1Transaction {
150150

151151
pub type ParseResult<T> = ::Result<Option<(MessageHead<T>, usize)>>;
152152

153-
struct DebugTruncate<'a>(&'a [u8]);
154-
155-
impl<'a> fmt::Debug for DebugTruncate<'a> {
156-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
157-
let bytes = self.0;
158-
if bytes.len() > 32 {
159-
try!(f.write_str("["));
160-
for byte in &bytes[..32] {
161-
try!(write!(f, "{:?}, ", byte));
162-
}
163-
write!(f, "... {}]", bytes.len())
164-
} else {
165-
fmt::Debug::fmt(bytes, f)
166-
}
167-
}
168-
}
169-
170153
#[test]
171154
fn test_should_keep_alive() {
172155
let mut headers = Headers::new();

src/http/request.rs

-15
Original file line numberDiff line numberDiff line change
@@ -132,24 +132,9 @@ impl<B> fmt::Debug for Request<B> {
132132
}
133133
}
134134

135-
struct MaybeAddr<'a>(&'a Option<SocketAddr>);
136-
137-
impl<'a> fmt::Display for MaybeAddr<'a> {
138-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
139-
match *self.0 {
140-
Some(ref addr) => {
141-
write!(f, "addr={}, ", addr)
142-
},
143-
None => Ok(()),
144-
}
145-
}
146-
}
147-
148135
/// Constructs a request using a received ResponseHead and optional body
149136
pub fn from_wire<B>(addr: Option<SocketAddr>, incoming: RequestHead, body: B) -> Request<B> {
150137
let MessageHead { version, subject: RequestLine(method, uri), headers } = incoming;
151-
info!("Request::new: {}\"{} {} {}\"", MaybeAddr(&addr), method, uri, version);
152-
debug!("Request::new: headers={:?}", headers);
153138

154139
Request::<B> {
155140
method: method,

src/http/response.rs

-4
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ impl fmt::Debug for Response {
147147
#[cfg(not(feature = "raw_status"))]
148148
pub fn from_wire<B>(incoming: ResponseHead, body: Option<B>) -> Response<B> {
149149
let status = incoming.status();
150-
info!("Response::new \"{} {}\"", incoming.version, status);
151-
debug!("Response::new headers={:?}", incoming.headers);
152150

153151
Response::<B> {
154152
status: status,
@@ -163,8 +161,6 @@ pub fn from_wire<B>(incoming: ResponseHead, body: Option<B>) -> Response<B> {
163161
#[cfg(feature = "raw_status")]
164162
pub fn from_wire<B>(incoming: ResponseHead, body: Option<B>) -> Response<B> {
165163
let status = incoming.status();
166-
info!("Response::new \"{} {}\"", incoming.version, status);
167-
debug!("Response::new headers={:?}", incoming.headers);
168164

169165
Response::<B> {
170166
status: status,

0 commit comments

Comments
 (0)