trogdir_models 0.11.6 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 277860888e824ed5b7c0afc168ad05139041e318
-  data.tar.gz: 9d7a3d280274887346be62bbaa0ed4eb190e00f9
+  metadata.gz: 2c940130b860e29fd8134f62164b096775aedf18
+  data.tar.gz: 65ce7e6716aa92daa54fc1cd7801902b2db5a7be
 SHA512:
-  metadata.gz: 0033b8c45a72589c0f3fcfd9149e76cbbb8f8eb1be65c3c388c5e678b8ff24b0b73ea2adb8ab78316cd810e8f11f6b6c1d58d7c8f87f9720bcbcf2d731978e38
-  data.tar.gz: dcee29b97cef7d763507c6a2113e407ced3a3492789afc046e4a8c8de518dd0af56f63e6c76bb1e6b0e935e996029cda1d60562630bf32dd94f487d944313486
+  metadata.gz: 0bc80199f2d63ad57f150cdf345d459e91d73052dcb354f6cad7ef2d371a1e0a9565799be6de59f0ea8fc3693321ecb8eb4d1c62dca43163ba4fb6561e235919
+  data.tar.gz: a1c3eb1be8c7ab4f77b3646a9d9930895a4748b932881eaf77611273b9b10421af681146717111c0c8db17b10b4cd905df40ba55540332cfb2e257b808af201a

data/lib/trogdir/change_sync.rb

@@ -5,4 +5,35 @@ class ChangeSync
   belongs_to :syncinator
   embeds_many :sync_logs
   field :run_after, type: Time, default: -> { Time.now - 1 }
+
+  before_save :update_run_after
+
+  def status
+    @status ||= if sync_logs.any? { |sl| sl.succeeded_at? }
+      :succeeded
+    elsif sync_logs.to_a.find { |sl| sl.errored_at? }
+      :errored
+    elsif sync_logs.to_a.find { |sl| sl.started_at? }
+      :pending
+    else
+      :unsynced
+    end
+  end
+
+  def latest_sync_log
+    sync_logs.asc(:started_at).last
+  end
+
+  def update_run_after
+    self.run_after = if sync_logs.any? { |sl| sl.succeeded_at_changed? }
+      nil
+    elsif sync_logs.to_a.find { |sl| sl.errored_at_changed? }
+      # wait exponentially longer between retries the more it fails
+      latest_sync_log.errored_at + (sync_logs.length**4).minutes
+    elsif sync_logs.to_a.find { |sl| sl.started_at_changed? }
+      latest_sync_log.started_at + 1.hour
+    else
+      run_after
+    end
+  end
 end

data/lib/trogdir/sync_log.rb

@@ -26,14 +26,7 @@ class SyncLog
   private
 
   def update_change_sync
-    change_sync.run_after = if succeeded_at_changed?
-      nil
-    elsif errored_at_changed?
-      # wait exponentially longer between retries the more it fails
-      errored_at + (change_sync.sync_logs.length**4).minutes
-    elsif started_at_changed?
-      started_at + 1.hour
-    end
+    change_sync.update_run_after
   end
 
   def save_change_sync

data/lib/trogdir/syncinator.rb

@@ -66,6 +66,12 @@ class Syncinator
   end
 
   def error!(sync_log, message)
+    # Because we have to save the change_sync instead of the sync_log (see below)
+    # we need to make sure we grab the sync_log through the change_sync, other wise
+    # the save on change_sync doesn't catch the changes to sync_log.
+    change_sync = sync_log.change_sync
+    sync_log = change_sync.sync_logs.find_by(id: sync_log.id)
+
     sync_log.errored_at = Time.now
     sync_log.message = message
     # There seems to be a bug in mongoid 4.0.2 that saves two records if you call just
@@ -78,6 +84,12 @@ class Syncinator
   end
 
   def finish!(sync_log, action, message = nil)
+    # Because we have to save the change_sync instead of the sync_log (see below)
+    # we need to make sure we grab the sync_log through the change_sync, other wise
+    # the save on change_sync doesn't catch the changes to sync_log.
+    change_sync = sync_log.change_sync
+    sync_log = change_sync.sync_logs.find_by(id: sync_log.id)
+
     sync_log.succeeded_at = Time.now
     sync_log.action = action
     sync_log.message = message

data/lib/trogdir_models/version.rb

@@ -1,3 +1,3 @@
 module TrogdirModels
-  VERSION = '0.11.6'
+  VERSION = '0.11.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_models
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth