Skip to content

Commit 8959b6e

Browse files
authored
Merge pull request #184 from joeyespo/fix-182
Use Flask.before_request instead of Flask.before_first_request to work around the re-entry deadlock introduced in Flask 0.11
2 parents e1d63b9 + 71f9984 commit 8959b6e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

grip/app.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ def __init__(self, source=None, auth=None, renderer=None,
128128
rate_limit_route = posixpath.join(grip_url, 'rate-limit-preview')
129129

130130
# Initialize views
131-
self.before_first_request(self._retrieve_styles)
131+
self._styles_retrieved = False
132+
self.before_request(self._retrieve_styles)
132133
self.add_url_rule(asset_route, 'asset', self._render_asset)
133134
self.add_url_rule(asset_subpath, 'asset', self._render_asset)
134135
self.add_url_rule('/', 'render', self._render_page)
@@ -310,6 +311,10 @@ def _retrieve_styles(self):
310311
Retrieves the style URLs from the source and caches them. This
311312
is called before the first request is dispatched.
312313
"""
314+
if self._styles_retrieved:
315+
return
316+
self._styles_retrieved = True
317+
313318
try:
314319
self.assets.retrieve_styles(url_for('asset'))
315320
except Exception as ex:

0 commit comments

Comments
 (0)