gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #691 from kmycode/upstream-20240403

Browse source 
Upstream 20240403
This commit is contained in:
KMY（雪あすか） 2024-04-03 18:21:00 +09:00 • committed by GitHub
commit 07c6d896e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
63 changed files with 828 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/paperclip/attachment_extensions.rb
View file

@ -84,13 +84,11 @@ module Paperclip
# 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)
else
raise error
end
end.run
Stoplight('object-storage')
.with_threshold(STOPLIGHT_THRESHOLD)
.with_cool_off_time(STOPLIGHT_COOLDOWN)
.with_error_handler { |error, handle| error.is_a?(Seahorse::Client::NetworkingError) ? handle.call(error) : raise(error) }
.run { super }
end
end
end