eventmachine-tail 0.1.20100505022629 → 0.1.20100506012705

data/bin/rtail

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "eventmachine"
+require "eventmachine-tail"
+
+class Reader < EventMachine::FileTail
+  def initialize(path, startpos=-1)
+    super(path, startpos)
+    @buffer = BufferedTokenizer.new
+  end
+
+  def receive_data(data)
+    @buffer.extract(data).each do |line|
+      puts "#{path}: #{line}"
+    end
+  end
+end
+
+def main(args)
+  if args.length == 0
+    puts "Usage: #{$0} <path_or_glob> [path_or_glob2] [...]"
+    return 1
+  end
+
+  EventMachine.run do
+    args.each do |path|
+      EventMachine::FileGlobWatchTail.new(path, Reader)
+    end
+  end
+end # def main
+
+exit(main(ARGV))

data/lib/em/filetail.rb

@@ -40,7 +40,8 @@ class EventMachine::FileTail
   def initialize(path, startpos=-1)
     @path = path
     @logger = Logger.new(STDOUT)
-    @logger.level = Logger::WARN
+    @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
+    @logger.debug("Tailing #{path} starting at position #{startpos}")
 
     @fstat = File.stat(@path)
 
@@ -73,6 +74,11 @@ class EventMachine::FileTail
     end
   end
 
+  public
+  def receive_data(data)
+    @logger.warn("Got #{data.length} bytes")
+  end
+
   private
   def open
     @file.close if @file
@@ -90,7 +96,7 @@ class EventMachine::FileTail
 
   private
   def watch
-    EventMachine::watch_file(@path, FileWatcher, self)
+    EventMachine::watch_file(@path, EventMachine::FileTail::FileWatcher, self)
   end
 
   private
@@ -147,39 +153,41 @@ end # class EventMachine::FileTail
 
 # Internal usage only
 class EventMachine::FileTail::FileWatcher < EventMachine::FileWatch
-  def initialize(filestream)
-    @filestream = filestream
+  def initialize(filewatch)
+    @filewatch = filewatch
     @logger = Logger.new(STDOUT)
-    @logger.level = Logger::WARN
+    @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
+    @logger.debug("Watching on #{filewatch.path}")
   end
 
   def file_modified
-    @filestream.notify :modified
+    @filewatch.notify :modified
   end
 
   def file_moved
-    @filestream.notify :moved
+    @filewatch.notify :moved
   end
 
   def file_deleted
-    @filestream.notify :deleted
+    @filewatch.notify :deleted
   end
 
   def unbind
-    @filestream.notify :unbind
+    @filewatch.notify :unbind
   end
 end # class EventMachine::FileTail::FileWatch < EventMachine::FileWatch
 
 # Add EventMachine::file_tail
 module EventMachine
-  
   # Tail a file.
   #
   # path is the path to the file to tail.
   # handler should be a module implementing 'receive_data' or
   # must be a subclasses of EventMachine::FileTail
   def self.file_tail(path, handler=nil, *args)
-    args.unshift(path)
+    # This code mostly styled on what EventMachine does in many of it's other
+    # methods.
+    args = [path, *args]
     klass = klass_from_handler(EventMachine::FileTail, handler, *args);
     c = klass.new(*args)
     yield c if block_given?

data/lib/em/globwatcher.rb

@@ -20,11 +20,10 @@ require "em/filetail"
 class EventMachine::FileGlobWatch
   def initialize(pathglob, interval=60)
     @pathglob = pathglob
-    #@handler = handler
     @files = Set.new
     @watches = Hash.new
     @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
+    @logger.level = ($DEBUG and Logger::DEBUG or Logger::WARN)
 
     # We periodically check here because it is easier than writing our own glob
     # parser (so we can smartly watch globs like /foo/*/bar*/*.log)
@@ -69,7 +68,11 @@ class EventMachine::FileGlobWatch
     # If EventMachine::watch_file fails, that's ok, I guess.
     # We'll still find the file 'missing' from the next glob attempt.
     begin
-      @watches[path] = EventMachine::watch_file(path, GlobFileWatch, self)
+      # EM currently has a bug that only the first handler for a watch_file
+      # on each file gets events. This causes globtails to never get data 
+      # since the glob is watching the file already.
+      # Until we fix that, let's skip file watching here.
+      #@watches[path] = EventMachine::watch_file(path, GlobFileWatch, self)
     rescue Errno::EACCES => e
       @logger.warn(e)
     end
@@ -94,15 +97,15 @@ class EventMachine::FileGlobWatch
 end # class EventMachine::FileGlobWatch
 
 class EventMachine::FileGlobWatchTail < EventMachine::FileGlobWatch
-  def initialize(path, handler=nil, *args)
-    super(path, *args)
+  def initialize(path, handler=nil, interval=60, *args)
+    super(path, interval)
     @handler = handler
     @args = args
   end
 
   def file_found(path)
     begin
-      EventMachine::file_tail(path, @handler, *@args)
+      EventMachine::file_tail(path, @handler)
     rescue Errno::EACCES => e
       file_error(path, e)
     rescue Errno::EISDIR => e

data/samples/glob-tail.rb

@@ -16,17 +16,17 @@
 require "rubygems"
 require "eventmachine"
 require "eventmachine-tail"
-require "ap" # from rubygem awesome_print
 
 class Reader < EventMachine::FileTail
-  def initialize(*args)
-    super(*args)
+  def initialize(path, startpos=-1)
+    super(path, startpos)
+    puts "Tailing #{path}"
     @buffer = BufferedTokenizer.new
   end
 
   def receive_data(data)
     @buffer.extract(data).each do |line|
-      ap [path, line]
+      puts "#{path}: #{line}"
     end
   end
 end
@@ -38,11 +38,8 @@ def main(args)
   end
 
   EventMachine.run do
-    #handler = EventMachine::FileGlobWatchTail.new(Reader)
     args.each do |path|
       EventMachine::FileGlobWatchTail.new(path, Reader)
-      #EventMachine::FileGlobWatch.new(path, handler)
-      #EventMachine::file_tail(path, handler)
     end
   end
 end # def main

data/samples/tail.rb

@@ -9,8 +9,9 @@ require "eventmachine"
 require "eventmachine-tail"
 
 class Reader < EventMachine::FileTail
-  def initialize(path, startpos=0)
+  def initialize(path, startpos=-1)
     super(path, startpos)
+    puts "Tailing #{path}"
     @buffer = BufferedTokenizer.new
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 20100505022629
-  version: 0.1.20100505022629
+  - 20100506012705
+  version: 0.1.20100506012705
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -07:00
+date: 2010-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,8 +31,8 @@ dependencies:
   version_requirements: *id001
 description: Add file 'tail' implemented with EventMachine. Also includes a 'glob watch' class for watching a directory pattern for new matches, like /var/log/*.log
 email: jls@semicomplete.com
-executables: []
-
+executables: 
+- rtail
 extensions: []
 
 extra_rdoc_files: []
@@ -45,6 +45,7 @@ files:
 - samples/glob-tail.rb
 - samples/globwatch.rb
 - test/test_filetail.rb
+- bin/rtail
 has_rdoc: true
 homepage: http://code.google.com/p/semicomplete/wiki/EventMachineTail
 licenses: []