Skip to content

Commit 1014f63

Browse files
committed
Merge pull request #159 from hyperium/unlog
fix(logging): adjust several logging messages
2 parents ed6face + 07cf414 commit 1014f63

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

examples/hello.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ fn hello(_: Request, res: Response) {
1313

1414
fn main() {
1515
hyper::Server::http(Ipv4Addr(127, 0, 0, 1), 3000).listen(hello).unwrap();
16+
println!("Listening on http://127.0.0.1:3000");
1617
}

examples/server.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,5 @@ fn echo(mut req: Request, mut res: Response) {
5252
fn main() {
5353
let server = Server::http(Ipv4Addr(127, 0, 0, 1), 1337);
5454
server.listen(echo).unwrap();
55+
println!("Listening on http://127.0.0.1:1337");
5556
}

src/header/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl Headers {
114114
loop {
115115
match try!(http::read_header(rdr)) {
116116
Some((name, value)) => {
117-
debug!("raw header: {}={}", name, value);
117+
debug!("raw header: {}={}", name, value[].to_ascii());
118118
let name = CaseInsensitive(Owned(name));
119119
let item = match headers.data.entry(name) {
120120
Vacant(entry) => entry.set(RWLock::new(Item::raw(vec![]))),
@@ -389,15 +389,13 @@ fn get_or_parse<H: Header + HeaderFormat>(item: &RWLock<Item>) -> Option<&RWLock
389389
}
390390

391391
fn downcast<H: Header + HeaderFormat>(read: &Item) -> &H {
392-
debug!("downcasting {}", *read);
393392
match read.typed {
394393
Some(ref val) => unsafe { val.downcast_ref_unchecked() },
395394
_ => unreachable!()
396395
}
397396
}
398397

399398
fn downcast_mut<H: Header + HeaderFormat>(write: &mut Item) -> &mut H {
400-
debug!("downcasting {}", *write);
401399
match write.typed {
402400
Some(ref mut val) => unsafe { val.downcast_mut_unchecked() },
403401
_ => unreachable!()

src/http.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ pub fn read_header<R: Reader>(stream: &mut R) -> HttpResult<Option<RawHeaderLine
522522
};
523523
}
524524

525-
debug!("header value = {}", value);
525+
debug!("header value = {}", value[].to_ascii());
526526

527527
match try!(stream.read_byte()) {
528528
LF => Ok(Some((name, value))),

src/server/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pub use self::response::Response;
1111

1212
pub use net::{Fresh, Streaming};
1313

14+
use HttpError::HttpIoError;
1415
use {HttpResult};
1516
use header::common::Connection;
1617
use header::common::connection::{KeepAlive, Close};
@@ -92,9 +93,13 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
9293
let mut res = Response::new(&mut wrt);
9394
let req = match Request::new(&mut rdr, addr) {
9495
Ok(req) => req,
96+
Err(e@HttpIoError(_)) => {
97+
debug!("ioerror in keepalive loop = {}", e);
98+
return;
99+
}
95100
Err(e) => {
96101
//TODO: send a 400 response
97-
error!("request error: {}", e);
102+
error!("request error = {}", e);
98103
return;
99104
}
100105
};

0 commit comments

Comments
 (0)