forked from tobi/cacheable
-
Notifications
You must be signed in to change notification settings - Fork 13
feat: handle exceptions gracefully #98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
andheiberg
wants to merge
3
commits into
main
Choose a base branch
from
rescue-aggresively
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,43 +34,55 @@ def call(env) | |
| body.each { |part| body_string << part } | ||
| end | ||
|
|
||
| body_compressed = nil | ||
| if body_string && body_string != "" | ||
| headers['Content-Encoding'] = content_encoding | ||
| env["cacheable.compression_level"] = ResponseBank.compression_level_for_request(env, headers) | ||
| time = ResponseBank.measure do | ||
| body_compressed = ResponseBank.compress( | ||
| body_string, | ||
| content_encoding, | ||
| compression_level: env["cacheable.compression_level"], | ||
| ) | ||
| begin | ||
| body_compressed = nil | ||
| if body_string && body_string != "" | ||
| env["cacheable.compression_level"] = ResponseBank.compression_level_for_request(env, headers) | ||
| time = ResponseBank.measure do | ||
| body_compressed = ResponseBank.compress( | ||
| body_string, | ||
| content_encoding, | ||
| compression_level: env["cacheable.compression_level"], | ||
| ) | ||
| end | ||
| ResponseBank.log("Compression time: #{time}ms") | ||
| env["cacheable.compression_time"] = time | ||
| headers['Content-Encoding'] = content_encoding | ||
| end | ||
| ResponseBank.log("Compression time: #{time}ms") | ||
| env["cacheable.compression_time"] = time | ||
| end | ||
|
|
||
| cached_headers = headers.slice(*CACHEABLE_HEADERS) | ||
| # Store result | ||
| cache_data = [status, cached_headers, body_compressed, timestamp, env["cacheable.compression_level"]] | ||
|
|
||
| ResponseBank.write_to_cache(env['cacheable.key']) do | ||
| payload = MessagePack.dump(cache_data) | ||
| ResponseBank.write_to_backing_cache_store( | ||
| env, | ||
| env['cacheable.unversioned-key'], | ||
| payload, | ||
| expires_in: env['cacheable.versioned-cache-expiry'], | ||
| ) | ||
| end | ||
| cached_headers = headers.slice(*CACHEABLE_HEADERS) | ||
| # Store result | ||
| cache_data = [status, cached_headers, body_compressed, timestamp, env["cacheable.compression_level"]] | ||
|
|
||
| ResponseBank.write_to_cache(env['cacheable.key']) do | ||
| payload = MessagePack.dump(cache_data) | ||
| ResponseBank.write_to_backing_cache_store( | ||
| env, | ||
| env['cacheable.unversioned-key'], | ||
| payload, | ||
| expires_in: env['cacheable.versioned-cache-expiry'], | ||
| ) | ||
| end | ||
|
|
||
| # since we had to generate the compressed version already we may | ||
| # as well serve it if the client wants it | ||
| if body_compressed | ||
| if env['HTTP_ACCEPT_ENCODING'].to_s.include?(content_encoding) | ||
| body = [body_compressed] | ||
| else | ||
| # Remove content-encoding header for response with compressed content | ||
| headers.delete('Content-Encoding') | ||
| # since we had to generate the compressed version already we may | ||
| # as well serve it if the client wants it | ||
| if body_compressed | ||
| if env['HTTP_ACCEPT_ENCODING'].to_s.include?(content_encoding) | ||
| body = [body_compressed] | ||
| else | ||
| # Remove content-encoding header for response with compressed content | ||
| headers.delete('Content-Encoding') | ||
| end | ||
| end | ||
| rescue => exception | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Some exceptions (those not inheriting from |
||
| headers.delete('Content-Encoding') if body_compressed | ||
| ResponseBank.log("Failed to write to cache: #{exception.class} - #{exception.message}") | ||
| if env['response_bank.on_exception'] | ||
| begin | ||
| env['response_bank.on_exception'].call(exception) | ||
| rescue => handler_exception | ||
| ResponseBank.log("Exception handler failed: #{handler_exception.class} - #{handler_exception.message}") | ||
| end | ||
| end | ||
| end | ||
| end | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this could go in a helper method now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Trying it out I would say it makes the code worse.
The begin/rescue in call was already clear. Now you have a compress_and_cache_response method that shadows ResponseBank.write_to_cache, takes 5 positional arguments, and mutates headers and env as side effects. It hasn't really reduced complexity — it's just moved code around.