restforce-db 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab0eecfbe7d96562d9b473a036e8b84b95ea1394
-  data.tar.gz: cb384f1779f4c48d8e654affc00e205ba5a86a8f
+  metadata.gz: f63cdbd13c368d67e00032954b0b920a03bdc818
+  data.tar.gz: 686cd54d4d4c9771e70668455c50eefabc68a4f2
 SHA512:
-  metadata.gz: d7f800c5e374fdb8b3929cd9e23e2b17d31df13d9f74181985edd502248856a1cd39104dcf6131422d19fc4d0f598dd858d71983bda9f88ec52b5aff5cccf2dc
-  data.tar.gz: 518570b3d2d27b7b0bf2b3a3aee7f1403eb98d6932e767aecb535f4e0a772ce8b2104674af6fa5f6105fda4ba6a90a45ef8618cdef7d1e2139bb0f9ac8b35e40
+  metadata.gz: 726c45542d070d66fd0a9d875c06391f20c25f1c75153ac459300fee7de7df81983e46e19f20e6124c85364b9a865a85bae7384f89190c1e1efd42cb1ab80c2a
+  data.tar.gz: 041b0467c120897e7bb5363ec3632a8f5f5b301d9a0585516a296d79771fdafe4ca9330cbcb8464833a9b033b2f4dc3af28f7ae3a7edf50cf6440189bc4300bf

data/lib/restforce/db/associator.rb

@@ -39,6 +39,10 @@ module Restforce
         return unless database_instance && salesforce_instance
 
         sync_associations(database_instance, salesforce_instance)
+      rescue Faraday::Error::ClientError => e
+        # This should only be tripped if `synchronized_instances` makes a
+        # request to fetch the Salesforce instance.
+        DB.logger.error(SynchronizationError.new(e, database_instance))
       end
 
       # Internal: Given an instance for one system, find its synchronized pair

data/lib/restforce/db/initializer.rb

@@ -36,7 +36,7 @@ module Restforce
 
         @runner.cache_timestamp instance
         @runner.cache_timestamp created
-      rescue ActiveRecord::ActiveRecordError => e
+      rescue ActiveRecord::ActiveRecordError, Faraday::Error::ClientError => e
         DB.logger.error(SynchronizationError.new(e, instance))
       end
 

data/lib/restforce/db/version.rb

@@ -3,7 +3,7 @@ module Restforce
   # :nodoc:
   module DB
 
-    VERSION = "3.2.0"
+    VERSION = "3.2.1"
 
   end
 

data/lib/restforce/db/worker.rb

@@ -2,8 +2,13 @@ require "file_daemon"
 
 module Restforce
 
+  # :nodoc:
   module DB
 
+    # TaskMapping is a small data structure used to pass top-level task
+    # information through to a SynchronizationError when necessary.
+    TaskMapping = Struct.new(:id, :mapping)
+
     # Restforce::DB::Worker represents the primary polling loop through which
     # all record synchronization occurs.
     class Worker
@@ -154,6 +159,9 @@ module Restforce
       # Returns nothing.
       def task(task_class, mapping)
         task_class.new(mapping, runner).run(@changes)
+      rescue Faraday::Error::ClientError => e
+        task_mapping = TaskMapping.new(task_class, mapping)
+        error SynchronizationError.new(e, task_mapping)
       end
 
       # Internal: Has this worker been instructed to stop?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord