additional debug lines

This commit is contained in:
Sean McArthur
2014-09-27 14:10:17 -07:00
parent 5391e7f61a
commit 834cb09733
2 changed files with 4 additions and 1 deletions

View File

@@ -1,6 +1,7 @@
//! HTTP Server //! HTTP Server
use std::io::{Listener, IoResult, EndOfFile}; use std::io::{Listener, IoResult, EndOfFile};
use std::io::net::ip::{IpAddr, Port, SocketAddr}; use std::io::net::ip::{IpAddr, Port, SocketAddr};
use std::task::TaskBuilder;
use intertwine::{Intertwine, Intertwined}; use intertwine::{Intertwine, Intertwined};
use macceptor::MoveAcceptor; use macceptor::MoveAcceptor;
@@ -58,6 +59,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
let mut acceptors = Vec::new(); let mut acceptors = Vec::new();
let mut sockets = Vec::new(); let mut sockets = Vec::new();
for (ip, port) in self.pairs.into_iter() { for (ip, port) in self.pairs.into_iter() {
debug!("binding to {}:{}", ip, port);
let mut listener: L = try_io!(NetworkListener::<S, A>::bind(ip.to_string().as_slice(), port)); let mut listener: L = try_io!(NetworkListener::<S, A>::bind(ip.to_string().as_slice(), port));
sockets.push(try_io!(listener.socket_name())); sockets.push(try_io!(listener.socket_name()));
@@ -71,7 +73,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
.map(|acceptor| acceptor.move_incoming()) .map(|acceptor| acceptor.move_incoming())
.intertwine(); .intertwine();
spawn(proc() { TaskBuilder::new().named("hyper acceptor").spawn(proc() {
handler.handle(Incoming { from: connections }); handler.handle(Incoming { from: connections });
}); });

View File

@@ -37,6 +37,7 @@ impl Request {
/// immediately useful. /// immediately useful.
pub fn new<S: NetworkStream>(mut stream: S) -> HttpResult<Request> { pub fn new<S: NetworkStream>(mut stream: S) -> HttpResult<Request> {
let remote_addr = try_io!(stream.peer_name()); let remote_addr = try_io!(stream.peer_name());
debug!("remote addr = {}", remote_addr);
let mut stream = BufferedReader::new(stream.abstract()); let mut stream = BufferedReader::new(stream.abstract());
let (method, uri, version) = try!(read_request_line(&mut stream)); let (method, uri, version) = try!(read_request_line(&mut stream));
let headers = try!(Headers::from_raw(&mut stream)); let headers = try!(Headers::from_raw(&mut stream));