Merge branch 'backport-cache-middleware-fix' into 'master'

Backport cache middleware fix

See merge request !9867

1 files changed, 24 insertions, 0 deletions

diff --git a/config/initializers/fix_local_cache_middleware.rb b/config/initializers/fix_local_cache_middleware.rb
new file mode 100644
index 00000000000..cb37f9ed22c
--- /dev/null
+++ b/config/initializers/fix_local_cache_middleware.rb
@@ -0,0 +1,24 @@
+module LocalCacheRegistryCleanupWithEnsure
+  LocalCacheRegistry =
+    ActiveSupport::Cache::Strategy::LocalCache::LocalCacheRegistry
+  LocalStore =
+    ActiveSupport::Cache::Strategy::LocalCache::LocalStore
+
+  def call(env)
+    LocalCacheRegistry.set_cache_for(local_cache_key, LocalStore.new)
+    response = @app.call(env)
+    response[2] = ::Rack::BodyProxy.new(response[2]) do
+      LocalCacheRegistry.set_cache_for(local_cache_key, nil)
+    end
+    cleanup_after_response = true # ADDED THIS LINE
+    response
+  rescue Rack::Utils::InvalidParameterError
+    [400, {}, []]
+  ensure # ADDED ensure CLAUSE to cleanup when something is thrown
+    LocalCacheRegistry.set_cache_for(local_cache_key, nil) unless
+      cleanup_after_response
+  end
+end
+
+ActiveSupport::Cache::Strategy::LocalCache::Middleware
+  .prepend(LocalCacheRegistryCleanupWithEnsure)