mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 13:09:18 +08:00
Bump discourse_image_optim
which uses a global timeout.
Our previous solution has the timeout set at the worker level which means the total timeout would be X timeout secs * N number of workers.
This commit is contained in:
parent
9948f57a99
commit
72a3457379
2
Gemfile
2
Gemfile
|
@ -60,7 +60,7 @@ gem 'unf', require: false
|
|||
|
||||
gem 'email_reply_trimmer', '~> 0.1'
|
||||
|
||||
# Forked until https://github.com/toy/image_optim/pull/149 is merged
|
||||
# Forked until https://github.com/toy/image_optim/pull/162 is merged
|
||||
gem 'discourse_image_optim', require: 'image_optim'
|
||||
gem 'multi_json'
|
||||
gem 'mustache'
|
||||
|
|
|
@ -85,7 +85,7 @@ GEM
|
|||
crass (1.0.4)
|
||||
debug_inspector (0.0.3)
|
||||
diff-lcs (1.3)
|
||||
discourse_image_optim (0.26.1)
|
||||
discourse_image_optim (0.26.2)
|
||||
exifr (~> 1.2, >= 1.2.2)
|
||||
fspath (~> 3.0)
|
||||
image_size (~> 1.5)
|
||||
|
|
|
@ -253,7 +253,7 @@ class UploadCreator
|
|||
OptimizedImage.ensure_safe_paths!(@file.path)
|
||||
FileHelper.optimize_image!(@file.path)
|
||||
extract_image_info!
|
||||
rescue ImageOptim::Worker::TimeoutExceeded
|
||||
rescue ImageOptim::TimeoutExceeded
|
||||
Rails.logger.warn("ImageOptim timed out while optimizing #{@filename}")
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user