Commit 342414e8 authored by kmarshall's avatar kmarshall Committed by Commit bot

Get rid of log spam. They crept back into my client after my misadventures with merging.

R=wez
BUG=

Review URL: https://codereview.chromium.org/563003002

Cr-Commit-Position: refs/heads/master@{#294451}
parent b17510ab
...@@ -113,7 +113,6 @@ size_t MessageFramer::BytesRequested() { ...@@ -113,7 +113,6 @@ size_t MessageFramer::BytesRequested() {
scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes, scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
size_t* message_length, size_t* message_length,
ChannelError* error) { ChannelError* error) {
LOG(ERROR) << "Ingest1";
DCHECK(error); DCHECK(error);
DCHECK(message_length); DCHECK(message_length);
if (error_) { if (error_) {
...@@ -127,10 +126,8 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes, ...@@ -127,10 +126,8 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
message_bytes_received_ += num_bytes; message_bytes_received_ += num_bytes;
*error = CHANNEL_ERROR_NONE; *error = CHANNEL_ERROR_NONE;
*message_length = 0; *message_length = 0;
LOG(ERROR) << "Ingest2";
switch (current_element_) { switch (current_element_) {
case HEADER: case HEADER:
LOG(ERROR) << "IngestHeader";
if (BytesRequested() == 0) { if (BytesRequested() == 0) {
MessageHeader header; MessageHeader header;
MessageHeader::Deserialize(input_buffer_.get()->StartOfBuffer(), MessageHeader::Deserialize(input_buffer_.get()->StartOfBuffer(),
...@@ -146,14 +143,11 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes, ...@@ -146,14 +143,11 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
} }
break; break;
case BODY: case BODY:
LOG(ERROR) << "IngestBody";
if (BytesRequested() == 0) { if (BytesRequested() == 0) {
LOG(ERROR) << "IngestBodyBytesRequestedIsZero";
scoped_ptr<CastMessage> parsed_message(new CastMessage); scoped_ptr<CastMessage> parsed_message(new CastMessage);
if (!parsed_message->ParseFromArray( if (!parsed_message->ParseFromArray(
input_buffer_->StartOfBuffer() + MessageHeader::header_size(), input_buffer_->StartOfBuffer() + MessageHeader::header_size(),
body_size_)) { body_size_)) {
LOG(ERROR) << "Couldn't parse packet body";
VLOG(1) << "Error parsing packet body."; VLOG(1) << "Error parsing packet body.";
*error = CHANNEL_ERROR_INVALID_MESSAGE; *error = CHANNEL_ERROR_INVALID_MESSAGE;
error_ = true; error_ = true;
...@@ -161,7 +155,6 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes, ...@@ -161,7 +155,6 @@ scoped_ptr<CastMessage> MessageFramer::Ingest(size_t num_bytes,
} }
*message_length = body_size_; *message_length = body_size_;
Reset(); Reset();
LOG(ERROR) << "Returning message";
return parsed_message.Pass(); return parsed_message.Pass();
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment