couchrest_changes 0.0.3 → 0.0.4

data/lib/couchrest/changes/config.rb

@@ -5,6 +5,7 @@ module CouchRest
     module Config
       extend self
 
+      attr_writer :app_name
       attr_accessor :connection
       attr_accessor :seq_file
       attr_accessor :log_file
@@ -43,6 +44,10 @@ module CouchRest
          join('_')
       end
 
+      def app_name
+        @app_name ||= Pathname.new($0).basename
+      end
+
       private
 
       def init_logger
@@ -51,7 +56,7 @@ module CouchRest
           @logger = Logger.new(log_file)
         else
           require 'syslog/logger'
-          @logger = Syslog::Logger.new('leap_key_daemon')
+          @logger = Syslog::Logger.new(app_name)
         end
         @logger.level = Logger.const_get(log_level.upcase)
       end

data/lib/couchrest/changes/version.rb

@@ -1,5 +1,5 @@
 module CouchRest
   class Changes
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/couchrest/changes.rb

@@ -11,8 +11,8 @@ module CouchRest
 
     def initialize(db_name, options = {})
       db_name = Config.complete_db_name(db_name)
-      logger.info "Tracking #{db_name}"
-      logger.debug "Options: #{options.inspect}" if options.keys.any?
+      info "Tracking #{db_name}"
+      debug "Options: #{options.inspect}" if options.keys.any?
       @options = options
       @db = CouchRest.new(Config.couch_host).database(db_name)
       read_seq(Config.seq_file) unless rerun?
@@ -40,30 +40,24 @@ module CouchRest
     end
 
     def listen
-      logger.info "listening..."
-      logger.debug "Starting at sequence #{since}"
+      info "listening..."
+      debug "Starting at sequence #{since}"
       result = db.changes feed_options do |hash|
+        @retry_count = 0
         callbacks(hash)
         store_seq(hash["seq"])
       end
-      logger.info "couch stream ended unexpectedly." unless run_once?
-      logger.debug result.inspect
-    rescue MultiJson::LoadError
-      # appearently MultiJson has issues with the end of the
-      # couch stream if we do not use the continuous feed.
-      # For now we just catch the exception and proceed.
+      raise EOFError
+    # appearently MultiJson has issues with the end of the couch stream.
+    # So sometimes we get a MultiJson::LoadError instead...
+    rescue MultiJson::LoadError, EOFError, RestClient::ServerBrokeConnection
+      return if run_once?
+      log_and_recover(result)
+      retry
     end
 
     protected
 
-    def logger
-      logger ||= Config.logger
-    end
-
-    def db
-      @db
-    end
-
     def feed_options
       if run_once?
         { :since => since }
@@ -96,22 +90,22 @@ module CouchRest
     end
 
     def read_seq(filename)
-      logger.debug "Looking up sequence here: #{filename}"
+      debug "Looking up sequence here: #{filename}"
       FileUtils.touch(filename)
       unless File.writable?(filename)
         raise StandardError.new("Can't write to sequence file #{filename}")
       end
       @since = File.read(filename)
     rescue Errno::ENOENT => e
-      logger.warn "No sequence file found. Starting from scratch"
+      warn "No sequence file found. Starting from scratch"
     end
 
     def check_seq
       if @since == ''
         @since = nil
-        logger.debug "Found no sequence in the file."
+        debug "Found no sequence in the file."
       elsif @since
-        logger.debug "Found sequence: #{@since}"
+        debug "Found sequence: #{@since}"
       end
     end
 
@@ -119,13 +113,21 @@ module CouchRest
       File.write Config.seq_file, MultiJson.dump(seq)
     end
 
+    def log_and_recover(result)
+      debug result.inspect if result
+      info "Couch stream ended unexpectedly."
+      info "Will retry in 15 seconds."
+      info "Retried #{retry_count} times so far."
+      sleep 15
+      @retry_count += 1
+    end
+
     #
     # UNUSED: this is useful for only following new sequences.
     # might also require .to_json to work on bigcouch.
     #
     def fetch_last_seq
       hash = db.changes :limit => 1, :descending => true
-      logger.info "starting at seq: " + hash["last_seq"]
       return hash["last_seq"]
     end
 
@@ -136,5 +138,39 @@ module CouchRest
     def run_once?
       Config.flags.include?('--run-once')
     end
+
+    def info(message)
+      return unless log_attempt?
+      logger.info message
+    end
+
+    def debug(message)
+      return unless log_attempt?
+      logger.debug message
+    end
+
+    def warn(message)
+      return unless log_attempt?
+      logger.warn message
+    end
+
+    # let's not clutter the logs if couch is down for a longer time.
+    def log_attempt?
+      [0, 1, 2, 4, 8, 20, 40, 120].include?(retry_count) ||
+        retry_count % 240 == 0
+    end
+
+    def retry_count
+      @retry_count ||= 0
+    end
+
+    def logger
+      logger ||= Config.logger
+    end
+
+    def db
+      @db
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_changes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest