zuora_connect 1.7.22 → 1.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71fd9e77ec66013bead0a8b166972d14bd5cdc8
-  data.tar.gz: bc4e5d881ae3c1aa8a8444a96912e293f5acbc1d
+  metadata.gz: c0689c0f7ddcab4b3a8372cfcbcb159f0ecb0d58
+  data.tar.gz: 2004e29ec8d530e6e5e0d8d12a716d258a518e3f
 SHA512:
-  metadata.gz: b59fde5a73f634a5866923dcfb363431cd0214e4b2e1aeae8d86e7bdc67d5ea99135e5a9fb521aeca09977cd209b4ec4298c401906a53a41f543b273cea45619
-  data.tar.gz: 52ec2ac31d11dba2ea4c0165b1f73170409fd083f61b40eb1b22da156402d83137d1e9ce441669357bb25a046aa0673fe98835bcb84648abc5433a0c62da9915
+  metadata.gz: a9e3a19eee8faa2d33a66364b10c44d44f0af47380816fcc16eefc6327e160e9cfb1050e0c1bcef70ddc241f17ad0fdff4028486dad994651c822bac201e78a5
+  data.tar.gz: 9a371e88eed4895797aa8bfa336db5e408e5aa213ff21f627926dda7482f30e5689eade80c82b67f5f45e0fc3d265a90927be0011567e56fef8f2e2d3007145b

data/app/models/zuora_connect/app_instance_base.rb

@@ -478,26 +478,24 @@ module ZuoraConnect
       end
 
       def queue_paused?
-        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)
+        Resque.redis.zremrangebyscore("PauseQueue", "0", "(#{Time.now.to_i}")
+        return Resque.redis.zrange("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.zadd("resque:PauseQueue", Time.now.to_i + time, key)
+          Resque.redis.zadd("PauseQueue", Time.now.to_i + time, key)
         else
-          # Redis.current.set("resque:PauseQueue:#{self.id}", current_user)
-          Redis.current.zadd("resque:PauseQueue", 9999999999, key)
+          Resque.redis.zadd("PauseQueue", 9999999999, key)
         end
       end
 
       def queue_start(current_user: 'Default')
-        paused_user = Redis.current.zrange("resque:PauseQueue", 0, -1).map {|key| key.split("__")[0] == "#{self.id}" ? key.split("__")[1] : nil}.compact.first
+        paused_user = Resque.redis.zrange("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.zrem("resque:PauseQueue", "#{self.id}__#{paused_user}")
+          Resque.redis.zrem("PauseQueue", "#{self.id}__#{paused_user}")
         else
           raise "Can only unpause for user #{paused_user}." 
         end

data/config/initializers/redis.rb

@@ -1,10 +1,13 @@
 redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : defined?(Rails.application.secrets.redis) ? Rails.application.secrets.redis : 'redis://localhost:6379/1'
+resque_url = ENV["RESQUE_URL"].present? ?  ENV["RESQUE_URL"] : defined?(Rails.application.secrets.resque) ? Rails.application.secrets.resque : 'redis://localhost:6379/1'
 if defined?(Redis.current)
   Redis.current = Redis.new(:url => redis_url, :timeout => 10, :reconnect_attempts => 2)
   if defined?(Resque.redis)
-    Resque.redis = Redis.current
+    Resque.redis = resque_url != redis_url ? Redis.new(:url => resque_url, :timeout => 10, :reconnect_attempts => 2) : Redis.current
   end
 end
 if defined?(RedisBrowser)
-  RedisBrowser.configure("connections" => { "default" => { "url" => redis_url } })
+  RedisBrowser.configure("connections" => { 
+  	"Redis" => { "url" => redis_url },
+  	"Resque" => { "url" => resque_url }})
 end

data/config/initializers/resque.rb

@@ -8,7 +8,7 @@ end
 Resque.module_eval do
   # Returns a hash, mapping queue names to queue sizes
   def queue_sizes
-    paused_queues = Redis.current.zrange("resque:PauseQueue", 0, -1).map! {|key| key.split("__")[0]}
+    paused_queues = Resque.redis.zrange("PauseQueue", 0, -1).map! {|key| key.split("__")[0]}
     queue_names = queues.delete_if{|name| paused_queues.include?(name.split("_")[0])}
 
     sizes = redis.pipelined do

data/lib/resque/dynamic_queues.rb

@@ -94,8 +94,8 @@ module Resque
       real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
       
       #Queue Pausing 
-      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}
+      Resque.redis.zremrangebyscore("PauseQueue", "0", "(#{Time.now.to_i}")
+      paused_instances = Resque.redis.zrange("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.22"
+  VERSION = "1.7.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.22
+  version: 1.7.23
 platform: ruby
 authors:
 - Connect Team