From 3b03ff626a14b7418b1a519dc9683695b4aa40e5 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 5 Dec 2014 21:29:31 +0900
Subject: [PATCH] nghttpx: Don't log access log for blocked streams

---
 src/shrpx_downstream_queue.cc | 5 -----
 src/shrpx_downstream_queue.h  | 2 --
 src/shrpx_http2_upstream.cc   | 5 -----
 src/shrpx_spdy_upstream.cc    | 5 -----
 4 files changed, 17 deletions(-)

diff --git a/src/shrpx_downstream_queue.cc b/src/shrpx_downstream_queue.cc
index 9c46a18d..b61605c8 100644
--- a/src/shrpx_downstream_queue.cc
+++ b/src/shrpx_downstream_queue.cc
@@ -207,9 +207,4 @@ DownstreamQueue::get_active_downstreams() const {
   return active_downstreams_;
 }
 
-const DownstreamQueue::DownstreamMap &
-DownstreamQueue::get_blocked_downstreams() const {
-  return blocked_downstreams_;
-}
-
 } // namespace shrpx
diff --git a/src/shrpx_downstream_queue.h b/src/shrpx_downstream_queue.h
index dfc3d61c..3b7364e7 100644
--- a/src/shrpx_downstream_queue.h
+++ b/src/shrpx_downstream_queue.h
@@ -81,8 +81,6 @@ public:
   // or failure_downstreams_.
   Downstream *find(int32_t stream_id);
   const DownstreamMap &get_active_downstreams() const;
-  const DownstreamMap &get_blocked_downstreams() const;
-
   HostEntry &find_host_entry(const std::string &host);
 
   // Maximum number of concurrent connections to the same host.
diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc
index e95dc5c6..9e36e113 100644
--- a/src/shrpx_http2_upstream.cc
+++ b/src/shrpx_http2_upstream.cc
@@ -1395,11 +1395,6 @@ void Http2Upstream::on_handler_delete() {
       handler_->write_accesslog(ent.second.get());
     }
   }
-  for (auto &ent : downstream_queue_.get_blocked_downstreams()) {
-    if (ent.second->accesslog_ready()) {
-      handler_->write_accesslog(ent.second.get());
-    }
-  }
 }
 
 } // namespace shrpx
diff --git a/src/shrpx_spdy_upstream.cc b/src/shrpx_spdy_upstream.cc
index 2c95b913..a0f9752e 100644
--- a/src/shrpx_spdy_upstream.cc
+++ b/src/shrpx_spdy_upstream.cc
@@ -1089,11 +1089,6 @@ void SpdyUpstream::on_handler_delete() {
       handler_->write_accesslog(ent.second.get());
     }
   }
-  for (auto &ent : downstream_queue_.get_blocked_downstreams()) {
-    if (ent.second->accesslog_ready()) {
-      handler_->write_accesslog(ent.second.get());
-    }
-  }
 }
 
 } // namespace shrpx