Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
b9ed3961
Commit
b9ed3961
authored
Jan 06, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."
This reverts commit
4b027bc9
.
parent
95b1adb3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
14 deletions
+7
-14
lib/banzai/renderer.rb
lib/banzai/renderer.rb
+7
-14
No files found.
lib/banzai/renderer.rb
View file @
b9ed3961
module
Banzai
module
Banzai
module
Renderer
module
Renderer
CACHE_ENABLED
=
false
# Convert a Markdown String into an HTML-safe String of HTML
# Convert a Markdown String into an HTML-safe String of HTML
#
#
# Note that while the returned HTML will have been sanitized of dangerous
# Note that while the returned HTML will have been sanitized of dangerous
...
@@ -18,22 +20,13 @@ module Banzai
...
@@ -18,22 +20,13 @@ module Banzai
cache_key
=
context
.
delete
(
:cache_key
)
cache_key
=
context
.
delete
(
:cache_key
)
cache_key
=
full_cache_key
(
cache_key
,
context
[
:pipeline
])
cache_key
=
full_cache_key
(
cache_key
,
context
[
:pipeline
])
cacheless
=
cacheless_render
(
text
,
context
)
if
cache_key
&&
CACHE_ENABLED
Rails
.
cache
.
fetch
(
cache_key
)
do
if
cache_key
&&
ENV
[
"DEBUG_BANZAI_CACHE"
]
cacheless_render
(
text
,
context
)
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
}
"
end
end
else
cacheless_render
(
text
,
context
)
end
end
cacheless
end
end
def
self
.
render_result
(
text
,
context
=
{})
def
self
.
render_result
(
text
,
context
=
{})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment