mogilefsd_log_tailer 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    mogilefsd_log_tailer (0.0.1)
+    mogilefsd_log_tailer (0.0.2)
+      daemons
       eventmachine
 
 GEM
   remote: http://rubygems.org/
   specs:
+    daemons (1.1.6)
     eventmachine (0.12.10)
 
 PLATFORMS

data/bin/mogilefsd_tail

@@ -4,8 +4,4 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'mogilefsd_log_tailer'
-require 'mogilefsd_log_tailer/version'
-
-lt = MogilefsdLogTailer.new
-lt.parse_options!
-lt.run
+MogilefsdLogTailer.run

data/lib/mogilefsd_log_tailer/tail_handler.rb

@@ -0,0 +1,46 @@
+require 'eventmachine'
+
+module MogilefsdLogTailer
+  class TailHandler < EventMachine::Connection
+    def initialize(hostname, filename)
+      @hostname = hostname
+      @received_data = ''
+
+      if filename.nil? || filename.empty?
+        @file = $stdout
+      else
+        @file = File.open(filename, 'wb')
+      end
+    end
+
+    def post_init
+      @received_data = ''
+      send_data("!watch\r\n")
+    end
+
+    def receive_data(data)
+      # puts(" - Received #{data.inspect} from #{@hostname}")
+      if data =~ /\r\n/
+        lines = data.split("\r\n", -1)
+        lines.each_with_index do |line, i|
+          if i == 0
+            print_log_entry(@received_data + line)
+            @received_data = ''
+          elsif i == lines.size - 1
+            @received_data << line
+          else
+            print_log_entry(line)
+          end
+        end
+      else
+        @received_data << data
+      end
+    end
+
+    def print_log_entry(line)
+      msg = "#{Time.now.to_s}: #{@hostname}: #{line}"
+      @file.puts(msg)
+      @file.flush
+    end
+  end
+end

data/lib/mogilefsd_log_tailer/version.rb

@@ -1,3 +1,3 @@
-class MogilefsdLogTailer
-  VERSION = "0.0.1"
+module MogilefsdLogTailer
+  VERSION = "0.0.2"
 end

data/lib/mogilefsd_log_tailer.rb

@@ -1,70 +1,63 @@
+require 'daemons'
 require 'mogilefsd_log_tailer/version'
+require 'mogilefsd_log_tailer/tail_handler'
 require 'optparse'
-require 'eventmachine'
-require 'socket'
 
-class MogilefsdLogTailer
-  module Handler
-    def post_init
-      @received_data = ''
-      send_data("!watch\r\n")
-    end
-
-    def receive_data(data)
-      port, ip = Socket.unpack_sockaddr_in(get_peername)
-      # puts("Received #{data.inspect} from #{ip}:#{port}")
-      if data =~ /\r\n/
-        lines = data.split("\r\n")
-        lines.each_with_index do |line, i|
-          # puts("line #{i}: #{line.inspect}")
-          if i == 0
-            print_log_entry(@received_data + line, ip, port)
-            @received_data = ''
-          elsif i == lines.size - 1
-            @received_data << line
-          else
-            print_log_entry(line, ip, port)
-          end
-        end
-      else
-        @received_data << data
-      end
-      # puts("@received_data = #{@received_data.inspect}")
-    end
+module MogilefsdLogTailer
+  def self.parse_options!
+    hosts = []
+    filename = nil
+    daemonize = false
 
-    def print_log_entry(line, ip, port)
-      puts("#{Time.now.to_s}: #{ip}:#{port}: #{line}")
-    end
-  end
-
-  def initialize
-    @hosts = []
-  end
-
-  def parse_options!
     OptionParser.new do |o|
       script_name = File.basename($0)
       o.set_summary_indent('  ')
       o.banner = "#{script_name} version #{VERSION}\nUsage: #{script_name} [options] tracker1:port1 tracker2:port2 ..."
       o.separator ""
-      o.on_tail("-h", "--help", "Show this help message.") { puts o; exit }
+      o.on("-d", "--[no-]daemonize", "Run as a daemon.") { |d| daemonize = d }
+      o.on("-f", "--file FILE", "The log file to which the output should go.") { |n| filename = File.expand_path(n) }
+      o.on("-h", "--help", "Show this help message.") { puts o; exit }
     end.parse!
 
     while (h = ARGV.shift)
-      @hosts << h
+      hosts << h
     end
 
-    if @hosts.empty?
+    if hosts.empty?
       STDERR.puts("No hosts to tail.")
       exit(1)
     end
+
+    [
+      hosts,
+      {
+        :daemonize => daemonize,
+        :filename => filename,
+      },
+    ]
   end
 
-  def run
+  def self.run
+    hosts, options = parse_options!
+
+    log_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    if options[:filename]
+      log_dir = File.dirname(options[:filename])
+    end
+
+    if options[:daemonize]
+      Daemons.daemonize(
+        :app_name => 'mogilefsd_log_tailer',
+        :dir_mode => :normal,
+        :dir => log_dir,
+        :log_output => true
+        )
+    end
+
     EventMachine.run do
-      @hosts.each do |hp|
+      hosts.each do |hp|
         host, port = hp.split(':')
-        EventMachine.connect(host, port.to_i, Handler)
+        EventMachine.connect(host, port.to_i, TailHandler, host, options[:filename])
       end
     end
   end

data/mogilefsd_log_tailer.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "mogilefsd_log_tailer"
 
+  s.add_dependency('daemons')
   s.add_dependency('eventmachine')
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mogilefsd_log_tailer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &8400940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *8400940
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &16747740 !ruby/object:Gem::Requirement
+  requirement: &8400520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16747740
+  version_requirements: *8400520
 description: Script to do "tail -f" on the "!watch" output from several MogileFS trackers.
 email:
 - ahwatts@gmail.com
@@ -37,6 +48,7 @@ files:
 - Rakefile
 - bin/mogilefsd_tail
 - lib/mogilefsd_log_tailer.rb
+- lib/mogilefsd_log_tailer/tail_handler.rb
 - lib/mogilefsd_log_tailer/version.rb
 - mogilefsd_log_tailer.gemspec
 homepage: ''