zuora_connect 1.7.17 → 1.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7117b0834f79dd45623ad1e9cf5b01b41782fd
-  data.tar.gz: 21a969b576606ea7a52ef3cbf3664d6e90dc5bce
+  metadata.gz: 16272afa1f18fca253cf09ad9f4ede03f30ee9c4
+  data.tar.gz: afcf3723308cca26ef08e227c89baa155a44b06a
 SHA512:
-  metadata.gz: e045e4d1f9b0d511a3c33a73f5a5077d0f3f6b4ffe1f9fa1b6d0f051d08ac97ee41ef504dbf6f87c8b5363a84aa7fcba4f8c017f09afc12b8031d47958a75491
-  data.tar.gz: 4351586da2d9ceaa593b9b48788cfdc72e4e9e7ebcb035cf5319642b6a2a70b818c1ea03c4961d026387742046d9d371f607a6e00b41f0ce13ce441f6e4f6ff6
+  metadata.gz: 9ff95e609a141a89a54daa50ecb91c8cb60bab9a028e1a590ef4aba2707d54540bfbef8e71403e9d5421a9d9f97a8f17d0396fc28d106a94ce7f7b8b4012b032
+  data.tar.gz: f8fb72d93ca158707ef2bd1a747602900f0758e3ea5234468737b802af505e706a55d601cbcf32b52f4658ff74b6a3631bff8ea152211c210a2a2e50ea2435ea

data/app/models/zuora_connect/app_instance_base.rb

@@ -464,33 +464,40 @@ module ZuoraConnect
     ### START Resque Helping Methods ####
       def api_limit(start: true, time: API_LIMIT_TIMEOUT.to_i)
         if start
-          Redis.current.setex("APILimits:#{self.id}", time, true)
+          # Redis.current.setex("APILimits:#{self.id}", time, true)
+          Redis.current.zadd("APILimits", Time.now.to_i + time, self.id)
         else
-          Redis.current.del("APILimits:#{self.id}")
+          # Redis.current.del("APILimits:#{self.id}")
+          Redis.current.zrem("APILimits", self.id)
         end
       end
 
       def api_limit?
-        return Redis.current.get("APILimits:#{self.id}").to_bool
+        Redis.current.zremrangebyscore("APILimits", "0", "(#{Time.now.to_i}")
+        return Redis.current.zscore("APILimits", self.id).present?
       end
 
       def queue_paused?
-        return Redis.current.get("resque:PauseQueue:#{self.id}").present?
+        Redis.current.zremrangebyscore("resque:PauseQueue", "0", "(#{Time.now.to_i}")
+        return Redis.current.zrange("resque:PauseQueue", 0, -1).map {|key| key.split("__")[0]}.include?(self.id.to_s)
       end
 
       def queue_pause(time: nil, current_user: 'Default')
+        key = "#{self.id}__#{current_user}"
         if time.present?
           raise "Time must be fixnum of seconds." if time.class != Fixnum
-          Redis.current.setex("resque:PauseQueue:#{self.id}", time, current_user)
+          # Redis.current.setex("resque:PauseQueue:#{self.id}", time, current_user)
+          Redis.current.zadd("resque:PauseQueue", Time.now.to_i + time, key)
         else
-          Redis.current.set("resque:PauseQueue:#{self.id}", current_user)
+          # Redis.current.set("resque:PauseQueue:#{self.id}", current_user)
+          Redis.current.zadd("resque:PauseQueue", 9999999999, key)
         end
       end
 
       def queue_start(current_user: 'Default')
-        paused_user = Redis.current.get("resque:PauseQueue:#{self.id}") 
+        paused_user = Redis.current.zrange("resque:PauseQueue", 0, -1).map {|key| key.split("__")[0] == "#{self.id}" ? key.split("__")[1] : nil}.compact.first
         if paused_user == current_user || paused_user.blank?
-          Redis.current.del("resque:PauseQueue:#{self.id}")
+          Redis.current.zrem("resque:PauseQueue", "#{self.id}__#{paused_user}")
         else
           raise "Can only unpause for user #{paused_user}." 
         end

data/lib/resque/dynamic_queues.rb

@@ -89,11 +89,13 @@ module Resque
       matched_queues = []
 
       #Remove Queues under Api Limits
-      api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
+      Redis.current.zremrangebyscore("APILimits", "0", "(#{Time.now.to_i}")
+      api_limit_instances = Redis.current.zrange("APILimits", 0, -1).map {|key| key.to_i}
       real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
       
       #Queue Pausing 
-      paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}
+      Redis.current.zremrangebyscore("resque:PauseQueue", "0", "(#{Time.now.to_i}")
+      paused_instances = Redis.current.zrange("resque:PauseQueue", 0, -1).map {|key| key.split("__")[0].to_i}
       real_queues = real_queues.select {|key| key if !paused_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
 
       while q = queue_names.shift

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.17"
+  VERSION = "1.7.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.17
+  version: 1.7.18
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment