eventmachine-tail 0.6.1 → 0.6.2

data/lib/em/filetail.rb

@@ -180,7 +180,7 @@ class EventMachine::FileTail
   private
   def open
     return if @closed
-    @file.close if @file
+    @file.close if @file && !@file.closed?
     return unless File.exists?(@path)
     begin
       @logger.debug "Opening file #{@path}"
@@ -255,21 +255,25 @@ class EventMachine::FileTail
   private
   def read
     return if @closed
+
+    data = nil
     @logger.debug "#{self}: Reading..."
     begin
       data = @file.sysread(CHUNKSIZE)
-      data.force_encoding(@file.external_encoding) if FORCE_ENCODING
-
-      # Won't get here if sysread throws EOF
-      @position += data.length
-      @naptime = 0
-
-      # Subclasses should implement receive_data
-      receive_data(data)
-      schedule_next_read
-    rescue EOFError
+    rescue EOFError, IOError
       schedule_eof
+      return
     end
+
+    data.force_encoding(@file.external_encoding) if FORCE_ENCODING
+
+    # Won't get here if sysread throws EOF
+    @position += data.length
+    @naptime = 0
+
+    # Subclasses should implement receive_data
+    receive_data(data)
+    schedule_next_read
   end # def read
 
   # Do EOF handling on next EM iteration

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eventmachine-tail
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,18 +42,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/eventmachine-tail.rb
 - lib/em/filetail.rb
 - lib/em/globwatcher.rb
-- samples/tail.rb
+- lib/eventmachine-tail.rb
 - samples/glob-tail.rb
 - samples/globwatch.rb
 - samples/tail-with-block.rb
-- test/test_filetail.rb
-- test/logrotate.conf
-- test/test_glob.rb
+- samples/tail.rb
 - test/alltests.rb
+- test/test_glob.rb
 - test/testcase_helpers.rb
+- test/test_filetail.rb
 - bin/rtail
 - bin/emtail
 has_rdoc: true
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: eventmachine tail - a file tail implementation with glob support

data/test/logrotate.conf

@@ -1,4 +0,0 @@
-/tmp/foo/testfile {
-  rotate 5
-  size 50
-}