trogdir_models 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7378d7cbfd3494afdaaf326d28ce63a46d4dde00
-  data.tar.gz: 9effcfc1f4372689e5d38231342d05a292d72a8d
+  metadata.gz: d24c65d59c98428bcf8092f1e79d424ce0491a9e
+  data.tar.gz: c3a079f9aebb8f516fa9817aa7848c5b1b9b430e
 SHA512:
-  metadata.gz: ab7605d78c0f946250a9ad743d016e6d1138652dc8ef1d1f719c68e8d363ab51a1bbf8295cfddb02e3e0eceb6b216ce922c04cf35a4da41a2c81b2c56577b483
-  data.tar.gz: 8670018feccee0d3877dc03da6504f4b4ad4594ea075a4831780f228e9005d59c268adf8ad32d571436db32c4584878471998d8c8bbd458465fc9af744911afb
+  metadata.gz: e4c2dcb2c74c129126d9d5ccfe3a03e8080809bed745a5d0829923efe279fcbb138a1c8ba8938de79a5419ec2538a004c4bfb61032550d761663d71f4d2b98d0
+  data.tar.gz: d68d55c5199ca5a0a589424bcccda851010bb151ddbe525cc9bdea5399054497a1d76873e3b41fc528cf75b68123db94f917927fd1e0a338c694169ea52673c3

data/lib/trogdir/change_sync.rb

@@ -4,4 +4,5 @@ class ChangeSync
   embedded_in :changeset
   belongs_to :syncinator
   embeds_many :sync_logs
-end
+  field :run_after, type: Time, default: -> { Time.now - 1 }
+end

data/lib/trogdir/sync_log.rb

@@ -11,6 +11,9 @@ class SyncLog
 
   validates :started_at, presence: true
 
+  before_save :update_change_sync
+  after_save :save_change_sync
+
   delegate :changeset, :syncinator, to: :change_sync
 
   def self.find_through_parents(id)
@@ -19,4 +22,21 @@ class SyncLog
     change_sync = changeset.change_syncs.find_by('sync_logs._id' => id)
     change_sync.sync_logs.find(id)
   end
+
+  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
+  end
+
+  def save_change_sync
+    change_sync.save! if change_sync.run_after_changed?
+  end
 end

data/lib/trogdir/syncinator.rb

@@ -23,14 +23,15 @@ class Syncinator
     name
   end
 
-  def startable_changesets(retry_after = nil)
-    retry_after ||= 1.hour.ago
-
-    Changeset.nor(
-      :change_syncs.elem_match => {syncinator_id: id, :'sync_logs.succeeded_at'.ne => nil}
-    ).or(
-      {:change_syncs.elem_match => {syncinator_id: id, :sync_logs.in => [nil, []]}},
-      {:change_syncs.elem_match => {syncinator_id: id, :sync_logs.elem_match => {:started_at.lt => retry_after, succeeded_at: nil}}}
+  def unfinished_changesets
+    Changeset.where(
+      :change_syncs.elem_match => {syncinator_id: id, :run_after.ne => nil}
+    ).order_by(created_at: :asc)
+  end
+
+  def startable_changesets
+    Changeset.where(
+      :change_syncs.elem_match => {syncinator_id: id, :run_after.lt => Time.now }
     ).order_by(created_at: :asc)
   end
 

data/lib/trogdir_models/version.rb

@@ -1,3 +1,3 @@
 module TrogdirModels
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_models
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Adam Crownoble