More improvements to logs.

net/tools/quic/quic_simple_server_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_simple_server_stream.h"
 
 #include <list>
 #include <utility>
 
 #include "net/quic/core/quic_flags.h"
@@ skipping 43 matching lines @@
   SendErrorResponse();
 }
 
 void QuicSimpleServerStream::OnDataAvailable() {
   while (HasBytesToRead()) {
     struct iovec iov;
     if (GetReadableRegions(&iov, 1) == 0) {
       // No more data to read.
       break;
     }
-    QUIC_DVLOG(1) << "Processed " << iov.iov_len << " bytes for stream "
-                  << id();
+    QUIC_DVLOG(1) << "Stream " << id() << " processed " << iov.iov_len
+                  << " bytes.";
     body_.append(static_cast<char*>(iov.iov_base), iov.iov_len);
 
     if (content_length_ >= 0 &&
         body_.size() > static_cast<uint64_t>(content_length_)) {
       QUIC_DVLOG(1) << "Body size (" << body_.size() << ") > content length ("
                     << content_length_ << ").";
       SendErrorResponse();
       return;
     }
     MarkConsumed(iov.iov_len);
@@ skipping 17 matching lines @@
 void QuicSimpleServerStream::PushResponse(
     SpdyHeaderBlock push_request_headers) {
   if (id() % 2 != 0) {
     QUIC_BUG << "Client initiated stream shouldn't be used as promised stream.";
     return;
   }
   // Change the stream state to emulate a client request.
   request_headers_ = std::move(push_request_headers);
   content_length_ = 0;
   QUIC_DVLOG(1) << "Stream " << id()
-                << ": Ready to receive server push response.";
+                << " ready to receive server push response.";
 
   // Set as if stream decompresed the headers and received fin.
   QuicSpdyStream::OnInitialHeadersComplete(/*fin=*/true, 0, QuicHeaderList());
 }
 
 void QuicSimpleServerStream::SendResponse() {
   if (request_headers_.empty()) {
     QUIC_DVLOG(1) << "Request headers empty.";
     SendErrorResponse();
     return;
@@ skipping 67 matching lines @@
     bool is_redirection = response_code / 100 == 3;
     if (response_code != 200 && !is_redirection) {
       QUIC_LOG(WARNING) << "Response to server push request " << request_url
                         << " result in response code " << response_code;
       Reset(QUIC_STREAM_CANCELLED);
       return;
     }
   }
   std::list<QuicHttpResponseCache::ServerPushInfo> resources =
       response_cache_->GetServerPushResources(request_url);
-  QUIC_DVLOG(1) << "Found " << resources.size() << " push resources for stream "
-                << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " found " << resources.size()
+                << " push resources.";
 
   if (!resources.empty()) {
     QuicSimpleServerSession* session =
         static_cast<QuicSimpleServerSession*>(spdy_session());
     session->PromisePushResources(request_url, resources, id(),
                                   request_headers_);
   }
 
-  QUIC_DVLOG(1) << "Sending response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending response.";
   SendHeadersAndBodyAndTrailers(response->headers().Clone(), response->body(),
                                 response->trailers().Clone());
 }
 
 void QuicSimpleServerStream::SendNotFoundResponse() {
-  QUIC_DVLOG(1) << "Sending not found response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending not found response.";
   SpdyHeaderBlock headers;
   headers[":status"] = "404";
   headers["content-length"] =
       QuicTextUtils::Uint64ToString(strlen(kNotFoundResponseBody));
   SendHeadersAndBody(std::move(headers), kNotFoundResponseBody);
 }
 
 void QuicSimpleServerStream::SendErrorResponse() {
-  QUIC_DVLOG(1) << "Sending error response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending error response.";
   SpdyHeaderBlock headers;
   headers[":status"] = "500";
   headers["content-length"] =
       QuicTextUtils::Uint64ToString(strlen(kErrorResponseBody));
   SendHeadersAndBody(std::move(headers), kErrorResponseBody);
 }
 
 void QuicSimpleServerStream::SendHeadersAndBody(
     SpdyHeaderBlock response_headers,
     StringPiece body) {
   SendHeadersAndBodyAndTrailers(std::move(response_headers), body,
                                 SpdyHeaderBlock());
 }
 
 void QuicSimpleServerStream::SendHeadersAndBodyAndTrailers(
     SpdyHeaderBlock response_headers,
     StringPiece body,
     SpdyHeaderBlock response_trailers) {
   if (!allow_bidirectional_data() && !reading_stopped()) {
     StopReading();
   }
 
   // Send the headers, with a FIN if there's nothing else to send.
   bool send_fin = (body.empty() && response_trailers.empty());
-  QUIC_DLOG(INFO) << "Writing headers (fin = " << send_fin
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing headers (fin = " << send_fin
                   << ") : " << response_headers.DebugString();
   WriteHeaders(std::move(response_headers), send_fin, nullptr);
   if (send_fin) {
     // Nothing else to send.
     return;
   }
 
   // Send the body, with a FIN if there's no trailers to send.
   send_fin = response_trailers.empty();
-  QUIC_DLOG(INFO) << "Writing body (fin = " << send_fin
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing body (fin = " << send_fin
                   << ") with size: " << body.size();
   if (!body.empty() || send_fin) {
     WriteOrBufferData(body, send_fin, nullptr);
   }
   if (send_fin) {
     // Nothing else to send.
     return;
   }
 
   // Send the trailers. A FIN is always sent with trailers.
-  QUIC_DLOG(INFO) << "Writing trailers (fin = true): "
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing trailers (fin = true): "
                   << response_trailers.DebugString();
   WriteTrailers(std::move(response_trailers), nullptr);
 }
 
 const char* const QuicSimpleServerStream::kErrorResponseBody = "bad";
 const char* const QuicSimpleServerStream::kNotFoundResponseBody =
     "file not found";
 
 }  // namespace net