Chromium Code Reviews| Index: blimp/common/logging.cc |
| diff --git a/blimp/common/logging.cc b/blimp/common/logging.cc |
| index 6f5587b20843d6e1e5ebb98c77a8b7b944421679..86d246ab348a19ddf2f08c88cb4c006503cdcca3 100644 |
| --- a/blimp/common/logging.cc |
| +++ b/blimp/common/logging.cc |
| @@ -12,8 +12,10 @@ |
| #include "base/json/string_escape.h" |
| #include "base/lazy_instance.h" |
| #include "base/memory/ptr_util.h" |
| +#include "base/strings/string_number_conversions.h" |
| #include "base/strings/string_util.h" |
| #include "base/strings/stringprintf.h" |
| +#include "blimp/common/create_blimp_message.h" |
| #include "blimp/common/proto/blimp_message.pb.h" |
| namespace blimp { |
| @@ -248,6 +250,27 @@ class TabControlLogExtractor : public LogExtractor { |
| } |
| }; |
| +// Logs fields from BLOB_CHANNEL messages. |
| +class BlobChannelLogExtractor : public LogExtractor { |
| + void ExtractFields(const BlimpMessage& message, |
| + LogFields* output) const override { |
| + switch (message.blob_channel().type_case()) { |
| + case BlobChannelMessage::TypeCase::kTransferBlob: |
| + AddField("subtype", "TRANSFER_BLOB", output); |
| + AddField("id", |
| + base::HexEncode( |
| + message.blob_channel().transfer_blob().blob_id().data(), |
| + message.blob_channel().transfer_blob().blob_id().size()), |
| + output); |
| + AddField("payload_size", |
| + message.blob_channel().transfer_blob().payload().size(), |
| + output); |
|
Wez
2016/05/24 01:18:40
break; explicitly here, don't just drop-through.
Kevin M
2016/05/25 00:06:33
Done.
|
| + default: // unknown |
|
Wez
2016/05/24 01:18:40
Here and elsewhere(for follow-up CL), we should be
Kevin M
2016/05/25 00:06:33
Done, added todo to top of .cc.
|
| + break; |
| + } |
| + } |
| +}; |
| + |
| // No fields are extracted from |message|. |
| class NullLogExtractor : public LogExtractor { |
| void ExtractFields(const BlimpMessage& message, |
| @@ -271,6 +294,8 @@ BlimpMessageLogger::BlimpMessageLogger() { |
| base::WrapUnique(new SettingsLogExtractor)); |
| AddHandler("TAB_CONTROL", BlimpMessage::TAB_CONTROL, |
| base::WrapUnique(new TabControlLogExtractor)); |
| + AddHandler("BLOB_CHANNEL", BlimpMessage::BLOB_CHANNEL, |
| + base::WrapUnique(new BlobChannelLogExtractor)); |
| } |
| BlimpMessageLogger::~BlimpMessageLogger() {} |