Merge branch 'fix/io_timeouterror' into pagination_with_fix

op8867555 · Jan 31, 2024 · 1de23e3 · 1de23e3
2 parents 8868e23 + 78930aa
commit 1de23e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/command/update/general_lastup_updater.rb b/lib/command/update/general_lastup_updater.rb
@@ -70,7 +70,7 @@ def update_other_novels
               "general_lastup" => downloader.get_general_lastup,
               "length" => downloader.novel_length
             }
-          rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout
+          rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout, IO::TimeoutError
             next
           end
           data = @database[id]

diff --git a/lib/downloader.rb b/lib/downloader.rb
@@ -41,6 +41,7 @@ class Downloader
 
   class InvalidTarget < StandardError; end
   class SuspendDownload < StandardError; end
+  class IO::TimeoutError; end # for 3.1 or earlier
 
   def initialize(target, options = {})
     id = Downloader.get_id_by_target(target)
@@ -800,7 +801,7 @@ def get_latest_table_of_contents(old_toc, through_error: false)
       "subtitles" => subtitles
     }
     toc_objects
-  rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout => e
+  rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout, IO::TimeoutError => e
     raise if through_error   # エラー処理はしなくていいからそのまま例外を受け取りたい時用
     if e.message.include?("404")
       @stream.error "小説が削除されているか非公開な可能性があります"
@@ -1173,7 +1174,7 @@ def download_raw_data(url)
       URI.open(url, "r:#{@setting["encoding"]}", open_uri_options) do |fp|
         raw = Helper.pretreatment_source(fp.read, @setting["encoding"])
       end
-    rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout => e
+    rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout, IO::TimeoutError => e
       case e.message
       when /^503/
         # 503 はアクセス規制やメンテ等でリトライしてもほぼ意味がないことが多いため一度で諦める