baza.rb 0.9.9 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980789abe61ce0f5811b41b566af9c4a87c03223268af54dbc102a5147c50a9e
-  data.tar.gz: c01a90bcb753b210b41cbcfae8d54021465cf52a43c107642d1f2efcdb21dfeb
+  metadata.gz: f94511fc54301a20314e8d456a708e37a1cea845db41e9e2f88389f574f76e8f
+  data.tar.gz: 97d8b8027bca5379934eec24aacd006209b3fc0e316f94f90c4ad33c1d64aa05
 SHA512:
-  metadata.gz: eab49fdb4389c82f56f43ce05ad3ec526d56b48b61eff07fa9c67cfb48ef93e2ffcd60f7acdf535e4b2cf301bb35a85a8dee7f85521085d445253b0d135455ed
-  data.tar.gz: 477a00b39bb00e5315a24d60eb888a4915cb9c374bc3c12245b74917b3788919a44971937e1fad3f1267a06c3c371ab846ed5acce73097fa93611601e090366f
+  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.9'
+  VERSION = '0.9.11'
 end

data/lib/baza-rb.rb

@@ -652,9 +652,30 @@ class BazaRb
     attempt = 0
     loop do
       ret = yield
-      if ret.code == 429 && attempt < 3
+      if ret.code == 429 && attempt < 5
         attempt += 1
-        sleep(2**attempt)
+        seconds = 2**attempt
+        @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
       return ret
@@ -691,7 +712,7 @@ class BazaRb
     when 500
       msg +=
         ", most probably it's an internal error on the server, " \
-        'please report this to https://github.com/zerocracy/baza'
+        'please report this to https://github.com/zerocracy/baza.rb'
     when 503
       msg +=
         ", most probably it's an internal error on the server (#{headers['X-Zerocracy-Failure'].inspect}), " \
@@ -718,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
       )
@@ -741,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.9
+  version: 0.9.11
 platform: ruby
 authors:
 - Yegor Bugayenko