franz 1.4.14 → 1.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee78d80face7d2a796de3551493f5587300b236
-  data.tar.gz: 573935e9612b3c002f3430d9d19d6374e6354e71
+  metadata.gz: 466d76baa09c55e8460bc1c8d20cd328f4537b57
+  data.tar.gz: 762556d187b90dc20b3b8064d52cf0425b7d936a
 SHA512:
-  metadata.gz: 8d9eb1d74c5f3aafe0c05324a66831ae578936f7fd4aad758a792329c77286ccef990590669356ecc95364245c5319ce2cf76edcdc4ea81f8f3a675d5a126071
-  data.tar.gz: bf437303886139f402244f4161075341564ad36d161df59fc58f98f834bf50a59ac67a4fa55a14e42047bbb697eb835be4f24b48d68724ae3492c37b33732e6d
+  metadata.gz: 1547b7ab15bcc09cd58b5dfd8028868d6dac0b4d9d8baa30cced11f994d8540b8d4b1f822d528d7446ff0d8322a741edc84e0298bc3d64ca569f102c58aab314
+  data.tar.gz: afe157ba6e4d593629a0f00dea51cb945bfbaadf9c922320052850bdfb64693ccf6c84d47a058c1ac6b4db76886749f16f467ad346cae996d99aa2cb0e20c598

data/VERSION

@@ -1 +1 @@
-1.4.14
+1.4.15

data/lib/franz/agg.rb

@@ -39,8 +39,6 @@ module Franz
       @buffer = Franz::Sash.new
       @stop   = false
 
-      @num_events = 0
-
       @t1 = Thread.new do
         until @stop
           flush

data/lib/franz/input.rb

@@ -40,8 +40,6 @@ module Franz
           buffer_limit: nil,
           line_limit: nil,
           play_catchup?: nil,
-          skip_interval: nil,
-          stale_interval: nil,
           configs: []
         }
       }.deep_merge!(opts)
@@ -102,8 +100,6 @@ module Franz
         watch_events: watch_events,
         watch_interval: opts[:input][:watch_interval],
         play_catchup?: opts[:input][:play_catchup?],
-        skip_interval: opts[:input][:skip_interval],
-        stale_interval: opts[:input][:stale_interval],
         logger: opts[:logger],
         stats: stats,
         full_state: full_state

data/lib/franz/watch.rb

@@ -23,18 +23,11 @@ module Franz
       @deletions    = opts[:deletions]    || []
       @watch_events = opts[:watch_events] || []
 
-      # Check if files older than STALE_INTERVAL have been updated every
-      # SKIP_INTERVAL seconds. Useful if you've got tons of old files.
-      @stale_interval = opts[:stale_interval] || 900 # 15 minutes
-      @skip_interval  = opts[:skip_interval]  || 120 # 2 minutes
-
       @play_catchup   = opts[:play_catchup?].nil? ? true : opts[:play_catchup?]
       @watch_interval = opts[:watch_interval] || 10
       @stats          = opts[:stats]          || Hash.new
       @logger         = opts[:logger]         || Logger.new(STDOUT)
 
-      @num_skipped = 0
-
       # Make sure we're up-to-date by rewinding our old stats to our cursors
       if @play_catchup
         log.debug event: 'play catchup'
@@ -45,21 +38,12 @@ module Franz
 
       @stop = false
       @thread = Thread.new do
-        stale_updated = Time.now - @stale_interval
-
         until @stop
-          started = Time.now
           until discoveries.empty?
             @stats[discoveries.shift] = nil
           end
 
-          skip_stale = true
-          if stale_updated < started - @skip_interval
-            skip_stale = false
-            stale_updated = Time.now
-          end
-
-          watch(skip_stale).each do |deleted|
+          watch.each do |deleted|
             @stats.delete deleted
             deletions.push deleted
           end
@@ -106,12 +90,10 @@ module Franz
       watch_events.push name: name, path: path, size: size
     end
 
-    def watch skip_stale=true
+    def watch
       log.debug \
-        event: 'watch',
-        skip_stale: skip_stale
+        event: 'watch'
       deleted = []
-      skip_past = Time.now - @stale_interval
 
       stats.keys.each do |path|
         # Hacks for logs we've removed
@@ -119,12 +101,6 @@ module Franz
         next if File.basename(path) == 'zuora.log'
 
         old_stat = stats[path]
-
-        next if skip_stale \
-        && old_stat \
-        && old_stat[:mtime] \
-        && old_stat[:mtime] < skip_past
-
         stat = stat_for path
         stats[path] = stat
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.4.14
+  version: 1.4.15
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Aggregate log file events and send them elsewhere