active_record_api-request 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07723fe8a0e7ef8a09d646992c72e93f334473b2f90a86e74af704beb1e8b054
-  data.tar.gz: a6a7af0c05535d34ee363e455b3f3162d27a9f8c9990e8e4349cded201e7335b
+  metadata.gz: 3e1be4753a2cf5b8394c7313ee0b005a6228646fa71b92fa6574cc73e1825d5f
+  data.tar.gz: 43ae9b78126a3880af7a5796dcef31c86b11aa283f6291e078a57915414bf5be
 SHA512:
-  metadata.gz: 35c489d8cb6613b5b933b7a1cfdd258085a490d8cc76ad9efb908db450d27409566af8c05d5b83eabb0ddc07a57fd1c99ec9102c7b1a880979b50f6979b198b6
-  data.tar.gz: 4b4ad95507d5af98fc3a0061e3f97807d84f873c3de8e4d4bd6f35708fedbb5295e6a5f4295eda01e220d50c6df6957fcba86e628b747c23b41be81980b7c69d
+  metadata.gz: '008d6a81a7346699fc0cb9f0089ba6ecc7d7cd0b33fe48238e4cedad91ff9914d0cc111df64b20b5e60ad0d2625860ae6a3e1aa36e35f44b7f73c19de3513945'
+  data.tar.gz: 96ad30c6ff561125efbee2238c8f4bafbbf282528326ec1d593b74d15489787db01c7530b68971a838342b7262aff14b4437a8e330bfab8de85f6c09199c2bc7

data/lib/active_record_api/request/token_cache.rb

@@ -3,7 +3,7 @@ module ActiveRecordApi
   module Request
     class TokenCache
       include ActiveAttr::Model
-      attr_accessor  :debug
+      attr_accessor :debug
 
       def flush
         return unless defined? AUTH_REDIS_POOL
@@ -33,14 +33,14 @@ module ActiveRecordApi
           @token = nil
           @retry = 0
           while @token.nil? && @retry < 5
-            @retry += 1
             @token = @redis_client.get('auth_token')
             debug_log "retry ##{@retry}"
             debug_log "found token: #{@token}"
+            @retry += 1
             if @token.nil? || session_missing_for?(@token)
               if acquire_lock
                 begin
-                  debug_log "acquired lock and fetching token for cache"
+                  debug_log 'acquired lock and fetching token for cache'
                   @token = token_proc.call
                   raise "no token returned! #{@token}" if @token.nil?
                   @redis_client.set 'auth_token', @token
@@ -70,7 +70,7 @@ module ActiveRecordApi
           return nil
         end
 
-        @redis_session ||= Redis.new({url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION']})
+        @redis_session ||= Redis.new({ url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION'] })
       end
 
       def session_missing_for?(token)
@@ -86,7 +86,7 @@ module ActiveRecordApi
       end
 
       def acquire_lock
-        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 60
+        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 8
         current_lock_value = @redis_client.get 'auth_token_lock'
         debug_log "#{current_lock_value} == #{unique_key}"
         current_lock_value == unique_key
@@ -102,4 +102,5 @@ module ActiveRecordApi
     end
   end
 end
+
 #:nocov:#

data/lib/active_record_api/request/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecordApi
   module Request
-    VERSION = '0.3.15'.freeze
+    VERSION = '0.3.16'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-request
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr