Chromium Code Reviews| Index: net/spdy/spdy_session.cc |
| diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc |
| index 4055422f3137b1fa5baa74a0d45f3da89c817cc9..5482bd55f1d16c6dba6a276e6312e32efbb17fee 100644 |
| --- a/net/spdy/spdy_session.cc |
| +++ b/net/spdy/spdy_session.cc |
| @@ -257,13 +257,16 @@ scoped_ptr<base::Value> NetLogSpdyGoAwayCallback( |
| int active_streams, |
| int unclaimed_streams, |
| SpdyGoAwayStatus status, |
| - NetLogCaptureMode /* capture_mode */) { |
| + StringPiece debug_data, |
| + NetLogCaptureMode capture_mode) { |
| scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
| dict->SetInteger("last_accepted_stream_id", |
| static_cast<int>(last_stream_id)); |
| dict->SetInteger("active_streams", active_streams); |
| dict->SetInteger("unclaimed_streams", unclaimed_streams); |
| dict->SetInteger("status", static_cast<int>(status)); |
| + dict->SetString("goaway_debug_data", |
|
Ryan Hamilton
2015/10/05 21:17:55
nit: I think "goaway_" is redundant.
Bence
2015/10/06 15:18:57
You are right. I was using it to make it easier t
|
| + ElideGoAwayDebugDataForNetLog(capture_mode, debug_data)); |
| return dict.Pass(); |
| } |
| @@ -2452,15 +2455,17 @@ void SpdySession::OnRstStream(SpdyStreamId stream_id, |
| } |
| void SpdySession::OnGoAway(SpdyStreamId last_accepted_stream_id, |
| - SpdyGoAwayStatus status) { |
| + SpdyGoAwayStatus status, |
| + StringPiece debug_data) { |
| CHECK(in_io_loop_); |
| // TODO(jgraettinger): UMA histogram on |status|. |
| - net_log_.AddEvent(NetLog::TYPE_HTTP2_SESSION_GOAWAY, |
| - base::Bind(&NetLogSpdyGoAwayCallback, |
| - last_accepted_stream_id, active_streams_.size(), |
| - unclaimed_pushed_streams_.size(), status)); |
| + net_log_.AddEvent( |
| + NetLog::TYPE_HTTP2_SESSION_GOAWAY, |
| + base::Bind(&NetLogSpdyGoAwayCallback, last_accepted_stream_id, |
| + active_streams_.size(), unclaimed_pushed_streams_.size(), |
| + status, debug_data)); |
| MakeUnavailable(); |
| if (status == GOAWAY_HTTP_1_1_REQUIRED) { |
| // TODO(bnc): Record histogram with number of open streams capped at 50. |