trivial: debug logging cleanup

pull/7/head
Alexey Galakhov 7 years ago
parent 087636c3ad
commit 9e00140e19
  1. 2
      src/handshake/client.rs
  2. 1
      src/handshake/machine.rs
  3. 2
      src/handshake/server.rs
  4. 6
      src/protocol/frame/mod.rs
  5. 2
      src/protocol/mod.rs

@ -71,7 +71,7 @@ impl ClientHandshake {
} }
}; };
debug!("Client handshake initiated."); trace!("Client handshake initiated.");
MidHandshake { role: client, machine: machine } MidHandshake { role: client, machine: machine }
} }
} }

@ -39,6 +39,7 @@ impl<Stream> HandshakeMachine<Stream> {
impl<Stream: Read + Write> HandshakeMachine<Stream> { impl<Stream: Read + Write> HandshakeMachine<Stream> {
/// Perform a single handshake round. /// Perform a single handshake round.
pub fn single_round<Obj: TryParse>(mut self) -> Result<RoundResult<Obj, Stream>> { pub fn single_round<Obj: TryParse>(mut self) -> Result<RoundResult<Obj, Stream>> {
trace!("Doing handshake round.");
Ok(match self.state { Ok(match self.state {
HandshakeState::Reading(mut buf) => { HandshakeState::Reading(mut buf) => {
buf.reserve(MIN_READ, usize::max_value()) // TODO limit size buf.reserve(MIN_READ, usize::max_value()) // TODO limit size

@ -62,6 +62,7 @@ pub struct ServerHandshake;
impl ServerHandshake { impl ServerHandshake {
/// Start server handshake. /// Start server handshake.
pub fn start<Stream>(stream: Stream) -> MidHandshake<Stream, Self> { pub fn start<Stream>(stream: Stream) -> MidHandshake<Stream, Self> {
trace!("Server handshake initiated.");
MidHandshake { MidHandshake {
machine: HandshakeMachine::start_read(stream), machine: HandshakeMachine::start_read(stream),
role: ServerHandshake, role: ServerHandshake,
@ -83,6 +84,7 @@ impl HandshakeRole for ServerHandshake {
ProcessingResult::Continue(HandshakeMachine::start_write(stream, response)) ProcessingResult::Continue(HandshakeMachine::start_write(stream, response))
} }
StageResult::DoneWriting(stream) => { StageResult::DoneWriting(stream) => {
debug!("Server handshake done.");
ProcessingResult::Done(WebSocket::from_raw_socket(stream, Role::Server)) ProcessingResult::Done(WebSocket::from_raw_socket(stream, Role::Server))
} }
}) })

@ -46,7 +46,7 @@ impl<Stream> FrameSocket<Stream>
pub fn read_frame(&mut self) -> Result<Option<Frame>> { pub fn read_frame(&mut self) -> Result<Option<Frame>> {
loop { loop {
if let Some(frame) = Frame::parse(&mut self.in_buffer.out_mut())? { if let Some(frame) = Frame::parse(&mut self.in_buffer.out_mut())? {
debug!("received frame {}", frame); trace!("received frame {}", frame);
return Ok(Some(frame)); return Ok(Some(frame));
} }
// No full frames in buffer. // No full frames in buffer.
@ -54,7 +54,7 @@ impl<Stream> FrameSocket<Stream>
.map_err(|_| Error::Capacity("Incoming TCP buffer is full".into()))?; .map_err(|_| Error::Capacity("Incoming TCP buffer is full".into()))?;
let size = self.in_buffer.read_from(&mut self.stream)?; let size = self.in_buffer.read_from(&mut self.stream)?;
if size == 0 { if size == 0 {
debug!("no frame received"); trace!("no frame received");
return Ok(None) return Ok(None)
} }
} }
@ -71,7 +71,7 @@ impl<Stream> FrameSocket<Stream>
/// There is no need to resend the frame. In order to handle WouldBlock or Incomplete, /// There is no need to resend the frame. In order to handle WouldBlock or Incomplete,
/// call write_pending() afterwards. /// call write_pending() afterwards.
pub fn write_frame(&mut self, frame: Frame) -> Result<()> { pub fn write_frame(&mut self, frame: Frame) -> Result<()> {
debug!("writing frame {}", frame); trace!("writing frame {}", frame);
self.out_buffer.reserve(frame.len()); self.out_buffer.reserve(frame.len());
frame.format(&mut self.out_buffer).expect("Bug: can't write to vector"); frame.format(&mut self.out_buffer).expect("Bug: can't write to vector");
self.write_pending() self.write_pending()

@ -77,7 +77,7 @@ impl<Stream: Read + Write> WebSocket<Stream> {
// If we get here, either write blocks or we have nothing to write. // If we get here, either write blocks or we have nothing to write.
// Thus if read blocks, just let it return WouldBlock. // Thus if read blocks, just let it return WouldBlock.
if let Some(message) = self.read_message_frame()? { if let Some(message) = self.read_message_frame()? {
debug!("Received message {}", message); trace!("Received message {}", message);
return Ok(message) return Ok(message)
} }
} }

Loading…
Cancel
Save