Don’t require a custom retry check block on all Retryable instances

userlist · Nov 15, 2024 · 3dfb7ea · 3dfb7ea
1 parent f0831dc
commit 3dfb7ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/lib/userlist/push/strategies/direct.rb b/lib/userlist/push/strategies/direct.rb
@@ -19,17 +19,7 @@ def client
         end
 
         def retryable
-          @retryable ||= Userlist::Retryable.new do |error|
-            case error
-            when Userlist::RequestError
-              status = error.status
-              status >= 500 || status == 429
-            when Userlist::TimeoutError
-              true
-            else
-              false
-            end
-          end
+          @retryable ||= Userlist::Retryable.new
         end
       end
     end

diff --git a/lib/userlist/push/strategies/threaded/worker.rb b/lib/userlist/push/strategies/threaded/worker.rb
@@ -46,17 +46,7 @@ def client
           end
 
           def retryable
-            @retryable ||= Userlist::Retryable.new do |error|
-              case error
-              when Userlist::RequestError
-                status = error.status
-                status >= 500 || status == 429
-              when Userlist::TimeoutError
-                true
-              else
-                false
-              end
-            end
+            @retryable ||= Userlist::Retryable.new
           end
         end
       end

diff --git a/lib/userlist/retryable.rb b/lib/userlist/retryable.rb
@@ -7,12 +7,24 @@ class Retryable
     MULTIPLIER = 2
     MAX_DELAY = 10_000
 
+    DEFAULT_RETRY_CHECK = lambda do |error|
+      case error
+      when Userlist::RequestError
+        status = error.status
+        status >= 500 || status == 429
+      when Userlist::TimeoutError
+        true
+      else
+        false
+      end
+    end
+
     def initialize(retries: RETRIES, delay: DELAY, max_delay: MAX_DELAY, multiplier: MULTIPLIER, &retry_check)
       @retries = retries
       @delay = delay
       @max_delay = max_delay
       @multiplier = multiplier
-      @retry_check = retry_check
+      @retry_check = retry_check || DEFAULT_RETRY_CHECK
     end
 
     def retry?(value)