From b9ed3961b55cf3dbc1a6d4c841d295dd23161c90 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 6 Jan 2016 13:25:13 +0100
Subject: Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."

This reverts commit 4b027bc93a7875c3937f6b90ac1049b4a4d72da5.
---
 lib/banzai/renderer.rb | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
index 910e1c6994e..115ae914524 100644
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -1,5 +1,7 @@
 module Banzai
   module Renderer
+    CACHE_ENABLED = false
+
     # Convert a Markdown String into an HTML-safe String of HTML
     #
     # Note that while the returned HTML will have been sanitized of dangerous
@@ -18,22 +20,13 @@ module Banzai
       cache_key = context.delete(:cache_key)
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
-      cacheless = cacheless_render(text, context)
-
-      if cache_key && ENV["DEBUG_BANZAI_CACHE"]
-        cached = Rails.cache.fetch(cache_key) { cacheless }
-
-        if cached != cacheless
-          Rails.logger.warn "Banzai cache mismatch"
-          Rails.logger.warn "Text: #{text.inspect}"
-          Rails.logger.warn "Context: #{context.inspect}"
-          Rails.logger.warn "Cache key: #{cache_key.inspect}"
-          Rails.logger.warn "Cacheless: #{cacheless.inspect}"
-          Rails.logger.warn "With cache: #{cached.inspect}"
+      if cache_key && CACHE_ENABLED
+        Rails.cache.fetch(cache_key) do
+          cacheless_render(text, context)
         end
+      else
+        cacheless_render(text, context)
       end
-
-      cacheless
     end
 
     def self.render_result(text, context = {})
-- 
cgit v1.2.1


From cf19efec3ac0ab4510359dd71df3d511762230c3 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 6 Jan 2016 13:26:02 +0100
Subject: Revert "Temporarily disable Markdown caching"

This reverts commit d337d5e7137d9b3fd0f9b8890a3ba9296323acc7.
---
 lib/banzai/renderer.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
index 115ae914524..891c0fd7749 100644
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -1,7 +1,5 @@
 module Banzai
   module Renderer
-    CACHE_ENABLED = false
-
     # Convert a Markdown String into an HTML-safe String of HTML
     #
     # Note that while the returned HTML will have been sanitized of dangerous
@@ -20,7 +18,7 @@ module Banzai
       cache_key = context.delete(:cache_key)
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
-      if cache_key && CACHE_ENABLED
+      if cache_key
         Rails.cache.fetch(cache_key) do
           cacheless_render(text, context)
         end
-- 
cgit v1.2.1