diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-06 13:10:51 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-06 13:11:03 -0500 |
commit | be19feca36d100b4c2ac7a214c12346728b77ec1 (patch) | |
tree | 87fdd2182b31f35c504546a55bd272dbfa8545a0 | |
parent | 8d5140502e8da08fde34f02db258d938b61eb83b (diff) | |
download | gitlab-ce-be19feca36d100b4c2ac7a214c12346728b77ec1.tar.gz |
Revert "Merge branch 'debug-banzai-cache' into 'master'"
This reverts commit 9c8ce4b6b5d67a76827a7589ab1de207209b7fd6.
-rw-r--r-- | lib/banzai/renderer.rb | 21 |
1 files changed, 7 insertions, 14 deletions
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 = {}) |