zuora_connect 1.7.70 → 1.7.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e98c3300b664018c9d002002ca4cdaff656fd6
-  data.tar.gz: aa88143dd87e2a92c9ef94eec9fb9a8324301a11
+  metadata.gz: 3cb12b36b11cca5b692114f1757bbcf46ebe513c
+  data.tar.gz: 8d2849ed5052a8c4f2356d823e0f91359b738a2e
 SHA512:
-  metadata.gz: 9b531bd590a253e0a8dce6d35d5eee2a9a94b666aac3ec481078df258c3781c8cf723401eab6c39aea520c9eb4e3e66c2fd29f5cff8dcc403dc7215f6ba1dec0
-  data.tar.gz: 36461637ab5b86d8f6b2a0ce8ad15291ab4d5cf4f69b7ffa555666fd1550d9c333a720f076670127f935e62a66bdbd25d74f965c08092b6eaf4b2c7378902d46
+  metadata.gz: 3bd61e4e04378d305ce498782d28c84eb5a6a865b77629880981234d0d0a289f24aabe3086a18c241ba07906f69190d4786fd6c64080f5602375b19ee1bd9639
+  data.tar.gz: 7833808a65a37afd708004af4dd4c28bd22ef4725dc610d7bc33f5d1bdc7c27eefc97258a0bac5a00f29feaa4809a128229109a51ecb09d3baf1115cecc9f34f

data/app/models/zuora_connect/app_instance_base.rb

@@ -41,6 +41,8 @@ module ZuoraConnect
       if defined?(Redis.current)
         Redis.current.zadd("APILimits", 9999999999, "placeholder")
         Redis.current.zadd("InstanceRefreshing", 9999999999, "placeholder")
+      end
+      if defined?(Resque.redis)
         Resque.redis.zadd("PauseQueue", 9999999999, "placeholder")
       end
     end
@@ -49,7 +51,10 @@ module ZuoraConnect
       begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
       rescue Apartment::TenantNotFound => ex
-        Apartment::Tenant.create(self.id.to_s)
+        begin
+          Apartment::Tenant.create(self.id.to_s)
+        rescue Apartment::TenantExists => ex
+        end
         retry
       end
       if migrate && ActiveRecord::Migrator.needs_migration?
@@ -235,15 +240,16 @@ module ZuoraConnect
         elsif type == "stats"
           begin
             Resque.redis.ping
+            @resque = Resque.info
             @data = {
               app_name: ZuoraConnect::Telegraf.app_name,
               url: "dummy",
               Resque:{
-                Jobs_Finished: Resque.info[:processed] ,
-                Jobs_Failed: Resque.info[:failed],
-                Jobs_Pending: Resque.info[:pending],
-                Workers_Active: Resque.info[:working],
-                Workers_Total: Resque.info[:workers]
+                Jobs_Finished: @resque[:processed] ,
+                Jobs_Failed: @resque[:failed],
+                Jobs_Pending: @resque[:pending],
+                Workers_Active: @resque[:working],
+                Workers_Total: @resque[:workers]
               }
             }
           rescue
@@ -483,7 +489,6 @@ module ZuoraConnect
             Rails.logger.debug("[#{self.id}] Caching AppInstance")
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
-          Redis.current.del("Deleted:#{self.id}")
         end
       end
 

data/db/migrate/20100718151733_create_connect_app_instances.rb

@@ -1,4 +1,4 @@
-class CreateConnectAppInstances < ActiveRecord::Migration
+class CreateConnectAppInstances < ActiveRecord::Migration[4.2]
   def change
     if !ActiveRecord::Base.connection.table_exists?('zuora_connect_app_instances')
       create_table :zuora_connect_app_instances do |t|

data/db/migrate/20101024162319_add_tokens_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddTokensToAppInstance < ActiveRecord::Migration
+class AddTokensToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :access_token, :string unless column_exists? :zuora_connect_app_instances, :access_token
     add_column :zuora_connect_app_instances, :refresh_token, :string unless column_exists? :zuora_connect_app_instances, :refresh_token

data/db/migrate/20101024220705_add_token_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddTokenToAppInstance < ActiveRecord::Migration
+class AddTokenToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :token, :string  unless column_exists? :zuora_connect_app_instances, :token
   end

data/db/migrate/20110131211919_add_sessions_table.rb

@@ -1,4 +1,4 @@
-class AddSessionsTable < ActiveRecord::Migration
+class AddSessionsTable < ActiveRecord::Migration[4.2]
   def change
     if !ActiveRecord::Base.connection.table_exists?('sessions')
       create_table :sessions do |t|

data/db/migrate/20110411200303_add_expiration_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddExpirationToAppInstance < ActiveRecord::Migration
+class AddExpirationToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :oauth_expires_at, :datetime  unless column_exists? :zuora_connect_app_instances, :oauth_expires_at
   end

data/db/migrate/20110413191512_add_new_api_token.rb

@@ -1,4 +1,4 @@
-class AddNewApiToken < ActiveRecord::Migration
+class AddNewApiToken < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :api_token, :string  unless column_exists? :zuora_connect_app_instances, :api_token
   end

data/db/migrate/20110503003602_add_catalog_data_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogDataToAppInstance < ActiveRecord::Migration
+class AddCatalogDataToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_updated_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_updated_at
     add_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}  unless column_exists? :zuora_connect_app_instances, :catalog

data/db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogMappingsToAppInstance < ActiveRecord::Migration
+class AddCatalogMappingsToAppInstance < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_mapping, :jsonb, default: {} unless column_exists? :zuora_connect_app_instances, :catalog_mapping
   end

data/db/migrate/20110503003604_catalog_default.rb

@@ -1,4 +1,4 @@
-class CatalogDefault < ActiveRecord::Migration
+class CatalogDefault < ActiveRecord::Migration[4.2]
   def change
     change_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}
   end

data/db/migrate/20180301052853_add_catalog_attempted_at.rb

@@ -1,4 +1,4 @@
-class AddCatalogAttemptedAt < ActiveRecord::Migration
+class AddCatalogAttemptedAt < ActiveRecord::Migration[4.2]
   def change
     add_column :zuora_connect_app_instances, :catalog_update_attempt_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_update_attempt_at
   end

data/db/migrate/20181206162339_add_fields_to_instance.rb

@@ -1,4 +1,4 @@
-class AddFieldsToInstance < ActiveRecord::Migration
+class AddFieldsToInstance < ActiveRecord::Migration[4.2]
   def change
   	add_column :zuora_connect_app_instances, :name, :string, default: "" unless column_exists? :zuora_connect_app_instances, :name
   end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.70"
+  VERSION = "1.7.71"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.70
+  version: 1.7.71
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment