From 72a34573796dedcba8a9275f6d45f5c83603c14f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 9 Jul 2018 10:30:18 +0800
Subject: [PATCH] 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.
---
 Gemfile               | 2 +-
 Gemfile.lock          | 2 +-
 lib/upload_creator.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 192db0ffa8b..bc104eaf9f6 100644
--- a/Gemfile
+++ b/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c806b77ca1..404e6df3caa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 6d49f34340b..badc89a6f2a 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -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