Introduce "polling_interval_multiplier" as application setting

Implement module for setting "Poll-Interval" response header.
Return 429 in ETag caching middleware when polling is disabled.

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/gitlab/etag_caching/middleware.rb b/lib/gitlab/etag_caching/middleware.rb
index ffbc6e17dc5..9c98f0d1a30 100644
--- a/lib/gitlab/etag_caching/middleware.rb
+++ b/lib/gitlab/etag_caching/middleware.rb
@@ -18,8 +18,7 @@ module Gitlab
         if_none_match = env['HTTP_IF_NONE_MATCH']
 
         if if_none_match == etag
-          Gitlab::Metrics.add_event(:etag_caching_cache_hit)
-          [304, { 'ETag' => etag }, ['']]
+          handle_cache_hit(etag)
         else
           track_cache_miss(if_none_match, cached_value_present)
 
@@ -52,6 +51,14 @@ module Gitlab
         %Q{W/"#{value}"}
       end
 
+      def handle_cache_hit(etag)
+        Gitlab::Metrics.add_event(:etag_caching_cache_hit)
+
+        status_code = Gitlab::PollingInterval.polling_enabled? ? 304 : 429
+
+        [status_code, { 'ETag' => etag }, ['']]
+      end
+
       def track_cache_miss(if_none_match, cached_value_present)
         if if_none_match.blank?
           Gitlab::Metrics.add_event(:etag_caching_header_missing)