canvas_sync 0.17.10.beta1 → 0.17.10.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6a43a361ad4f9e634d8f5905f8992d691c9d196bce5a128663e7979c4438c9
-  data.tar.gz: 52f342d59d3e6094670016b72d1859eb90f9f9bf6cea99f922dc74893cbb9aa8
+  metadata.gz: 947495f899273388056680a57c2a00dfb8afc8442d3ca1745cd6ca273ae336e4
+  data.tar.gz: d7ac201bad5a5191eaa17a85a7b114904b0cba1f2c0e6284d075e15303a1a101
 SHA512:
-  metadata.gz: 6f04fefa3865648b69790a4cdb286d1dfdad5065e7659b1565eaaf1c5ac5f7d657e19551c81fa4468c3deb309fc8d199e7370310bce255ad1ea175b3a16419cd
-  data.tar.gz: b86eb164f7eadcd4c3155916b6c260a0d165001100aa00510329898793c6465693cab5313959ac946f3580a72090d29af670e566a67e3bb127eecdd947357b32
+  metadata.gz: ec8a981909991c72997e8e0137ef85e1d905cf8e714d611a757accafb34534b08f0976ee58aad1a33eaf4fc8327bd307375381eb849230f3e4d2c482617c2cc7
+  data.tar.gz: 3d08e2912b23ade3ea4c84aa39bf8db1a46472b977c77b2266cba956c24d8e725409859fe57a609d0ea1c9a662ea636f8c02e857816b0ac43ff15f600bacc978

data/config/initializers/apartment.rb

@@ -14,7 +14,7 @@ Rails.application.config.after_initialize do
         model.sequence_name = seq_name
       end
     end
-  rescue PG::ConnectionBad, ActiveRecord::NoDatabaseError
+  rescue PG::ConnectionBad, ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished
     # no-op if there is no database setup
   end
 end

data/lib/canvas_sync/job_batches/batch_aware_job.rb

@@ -25,7 +25,8 @@ module CanvasSync
 
         around_enqueue do |job, block|
           if (batch = Thread.current[:batch])
-            batch.increment_job_queue(job_id) if (@bid = batch.bid)
+            @bid = batch.bid
+            batch.increment_job_queue(job_id) if @bid
           end
           block.call
         end

data/lib/canvas_sync/job_batches/sidekiq.rb

@@ -49,7 +49,7 @@ module CanvasSync
         end
 
         def should_handle_batch?(msg)
-          return false if msg['class'] == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' && msg['wrapped'].constantize < BatchAwareJob
+          return false if msg['class'] == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' && (msg['wrapped'].to_s).constantize < BatchAwareJob
           true
         end
       end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.10.beta1".freeze
+  VERSION = "0.17.10.beta2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.10.beta1
+  version: 0.17.10.beta2
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler