dnsync 1.0.4 → 1.0.5

data/dnsync.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'dnsync'
-  s.version           = '1.0.4'
-  s.date              = '2015-03-25'
+  s.version           = '1.0.5'
+  s.date              = '2015-06-03'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/lib/dnsync.rb

@@ -1,4 +1,4 @@
 
 module Dnsync
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/dnsync/cli.rb

@@ -57,6 +57,9 @@ module Dnsync
         opts.on("--status-port=PORT", "Port to run status HTTP server on") do |v|
           Configlet[:status_port] = v
         end
+        opts.on("--status-grace-period=PERIOD", "Number of failed updates before reporting an error") do |v|
+          Configlet[:status_grace_period] = v
+        end
         opts.on("--noop", "Don't do any write operations") do |v|
           Configlet[:noop] = v.to_s
         end
@@ -162,7 +165,8 @@ module Dnsync
         Configlet[:dnsimple_token], Configlet[:domain])
 
       updater = RecurringZoneUpdater.new(dnsimple, nsone,
-        Configlet[:monitor_frequency] || 10)
+        Configlet[:monitor_frequency] || 10,
+        Configlet[:status_grace_period] || 5)
       updater.start
 
       if status_port = Configlet[:status_port]

data/lib/dnsync/recurring_zone_updater.rb

@@ -3,15 +3,17 @@ require 'atomic'
 
 module Dnsync
   class RecurringZoneUpdater
-    def initialize(source, destination, frequency)
-      @source      = source
-      @destination = destination
-      @frequency   = frequency
+    def initialize(source, destination, frequency, grace_period)
+      @source       = source
+      @destination  = destination
+      @frequency    = frequency.to_i
+      @grace_period = grace_period.to_i
 
       @thread          = Atomic.new(nil)
       @running         = Atomic.new(false)
       @last_updated_at = Atomic.new(nil)
       @last_exception  = Atomic.new(nil)
+      @failures        = Atomic.new(0)
     end
 
     def start
@@ -50,6 +52,7 @@ module Dnsync
       running   = @running.value
       updated   = last_updated
       exception = @last_exception.value
+      failures  = @failures.value
 
       problems = []
 
@@ -71,7 +74,7 @@ module Dnsync
         problems << "Successful update hasn't occured #{time_description}"
       end
 
-      if exception
+      if exception && failures > @grace_period
         problems << "Last update failed with #{exception.class}: #{exception.message}"
       end
 
@@ -82,7 +85,7 @@ module Dnsync
 
     def recently_updated?(updated = nil)
       updated ||= last_updated
-      updated && updated < (@frequency * 2)
+      updated && updated < (@frequency * @grace_period)
     end
 
     def last_updated
@@ -122,9 +125,11 @@ module Dnsync
           active_zone            = source_zone
           @last_updated_at.value = Time.now
           @last_exception.value  = nil
+          @failures.value        = 0
         rescue => e
           Scrolls.log_exception({ :from => :recurring_zone_updater, :zone => @source.domain }, e)
           @last_exception.value = e
+          @failures.update { |v| v + 1 }
         end
 
         if @running.value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnsync
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday