baza.rb 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbc7506438df13060cabc32fb5d87bb684a10a63f045d3d204788751f8e8ab5
-  data.tar.gz: 1e672c028f2b97bed37fedb335d9dd535a625295cbcd8592909ddf865d26b551
+  metadata.gz: f94511fc54301a20314e8d456a708e37a1cea845db41e9e2f88389f574f76e8f
+  data.tar.gz: 97d8b8027bca5379934eec24aacd006209b3fc0e316f94f90c4ad33c1d64aa05
 SHA512:
-  metadata.gz: d6300c6a5a7ee6fcd2de409901b42b3331166470348510721a3b5bbd667f69351de04cb52409b68a116cd22bea5aaa7a8c963c7167112467a3afb92796fa5aa5
-  data.tar.gz: fc58aab87af51e458bc6a20b91693f83f8a32507c504efcabc214fbd6e9be6c4402325bb4154326a9d8def4faed26a8ecf450251540a00cb89d1f0774f7308a5
+  metadata.gz: 4217832c03755e02d6b2c619282105069f1c9131d690704e2918d2dfeee8343f6511095e27e94a46fb9336063f6470057289befb89714eccc5437a8fd05ff2cb
+  data.tar.gz: 72fd3aabcf03aef3010bafe9659dd5d54e882dffcad12bf8ab0e79e6dad0f34acd5dcf77db7dfe053c740681359d32141863c72676bad489502c29cafe17b63e

data/lib/baza-rb/version.rb

@@ -13,5 +13,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class BazaRb
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

data/lib/baza-rb.rb

@@ -644,19 +644,37 @@ class BazaRb
     with_retries(max_tries: @retries, rescue: TimedOut, &)
   end
 
-  # Execute a block with retries on 429 and 500 status codes.
+  # Execute a block with retries on 429 status codes.
   #
   # @yield The block to execute with retries
   # @return [Object] The result of the block execution
   def retry_if_server_busy(&)
-    allowed = [429, 500]
     attempt = 0
     loop do
       ret = yield
-      if allowed.include?(ret.code) && attempt < 5
+      if ret.code == 429 && attempt < 5
         attempt += 1
         seconds = 2**attempt
-        @loog.info("Now, will sleep for #{seconds} and try again...")
+        @loog.info("Server seems to be busy, will sleep for #{seconds} and try again...")
+        sleep(seconds)
+        next
+      end
+      return ret
+    end
+  end
+
+  # Execute a block with retries on 500 status codes.
+  #
+  # @yield The block to execute with retries
+  # @return [Object] The result of the block execution
+  def retry_if_server_failed(&)
+    attempt = 0
+    loop do
+      ret = yield
+      if ret.code >= 500 && attempt < 5
+        attempt += 1
+        seconds = 2**attempt
+        @loog.info("Server seems to be in trouble, will sleep for #{seconds} and try again...")
         sleep(seconds)
         next
       end
@@ -721,13 +739,15 @@ class BazaRb
   def get(uri, allowed = [200])
     retry_it do
       checked(
-        retry_if_server_busy do
-          Typhoeus::Request.get(
-            uri.to_s,
-            headers:,
-            connecttimeout: @timeout,
-            timeout: @timeout
-          )
+        retry_if_server_failed do
+          retry_if_server_busy do
+            Typhoeus::Request.get(
+              uri.to_s,
+              headers:,
+              connecttimeout: @timeout,
+              timeout: @timeout
+            )
+          end
         end,
         allowed
       )
@@ -744,13 +764,15 @@ class BazaRb
   def post(uri, params, allowed = [302])
     retry_it do
       checked(
-        Typhoeus::Request.post(
-          uri.to_s,
-          body: params.merge('_csrf' => csrf),
-          headers:,
-          connecttimeout: @timeout,
-          timeout: @timeout
-        ),
+        retry_if_server_failed do
+          Typhoeus::Request.post(
+            uri.to_s,
+            body: params.merge('_csrf' => csrf),
+            headers:,
+            connecttimeout: @timeout,
+            timeout: @timeout
+          )
+        end,
         allowed
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza.rb
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Yegor Bugayenko