diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-03 10:26:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 10:26:09 +0200 |
| commit | d2f5760ceb12ade0134be5a5fe96e677c5e6c925 (patch) | |
| tree | 64164086531e2fc9a4a4abb355add786ba79f3af /lib | |
| parent | c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 (diff) | |
| parent | 7bf37551c8ee55d05a5dbca23db2cae7bb572789 (diff) | |
Merge pull request #1793 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/paperclip/attachment_extensions.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index 786f558e9..d66a17623 100644 --- a/lib/paperclip/attachment_extensions.rb +++ b/lib/paperclip/attachment_extensions.rb @@ -81,6 +81,9 @@ module Paperclip # to respond or don't respond at all and as such minimize the # impact of object storage outages on application throughput def save + # Don't go through Stoplight if we don't have anything object-storage-oriented to do + return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty? + Stoplight('object-storage') { super }.with_threshold(STOPLIGHT_THRESHOLD).with_cool_off_time(STOPLIGHT_COOLDOWN).with_error_handler do |error, handle| if error.is_a?(Seahorse::Client::NetworkingError) handle.call(error) |