remote_syslog 1.6.5 → 1.6.6.rc1

data/README.md

@@ -71,6 +71,12 @@ to `a.server.com:514`:
 
     $ remote_syslog -D -d a.server.com -f local0 -P /tmp /var/log/mysqld.log
 
+### Windows
+
+To run in Windows, start in a DOS Prompt or batch file and do not daemonize:
+
+    C:\> remote_syslog -D
+
 ## Auto-starting at boot
 
 The gem includes sample [init files] such as [remote_syslog.init.d]. remote_syslog will 
@@ -141,13 +147,19 @@ Provide a client certificate when connecting via TLS:
 
 ### Detecting new files
 
-All input files (filenames or globs) are re-checked for new files every 60
-seconds. Ruby's `Dir.glob` is used.
+remote_syslog automatically detects and activates new log files that match 
+its file specifiers. For example, `*.log` may be provided as a file specifier, 
+and remote_syslog will detect a `some.log` file created after it was started. 
+Globs are re-checked every 60 seconds. Ruby's `Dir.glob` is used.
 
-This means that files may be added and removed as long as they match a glob 
-path provided to `remote_syslog`. Also, explicitly-provided filenames need 
-not exist when `remote_syslog` is started. `remote_syslog` can be preconfigured 
-to monitor log files which are created later (or may never be created).
+Also, explicitly-provided filenames need not exist when `remote_syslog` is 
+started. `remote_syslog` can be pre-configured to monitor log files which are 
+created later (or may never be created).
+
+If globs are specified on the command-line, enclose each one in single-quotes 
+(`'*.log'`) so the shell passes the raw glob string to remote_syslog (rather 
+than the current set of matches). This is not necessary for globs defined in 
+the config file.
 
 
 ### Multiple instances

data/bin/remote_syslog

@@ -3,8 +3,4 @@
 require 'remote_syslog'
 require 'remote_syslog/cli'
 
-EM.error_handler { |e|
-  puts "Unhandled Exception: #{e.class}: #{e.message}:\n\t#{e.backtrace.join("\n\t")}"
-}
-
 RemoteSyslog::Cli.process!(ARGV)

data/lib/remote_syslog/agent.rb

@@ -0,0 +1,103 @@
+require 'eventmachine'
+require 'servolux'
+
+require 'remote_syslog/eventmachine_reader'
+require 'remote_syslog/file_tail_reader'
+require 'remote_syslog/glob_watch'
+require 'remote_syslog/message_generator'
+require 'remote_syslog/udp_endpoint'
+require 'remote_syslog/tls_endpoint'
+
+module RemoteSyslog
+  class Agent < Servolux::Server
+    # Who should we connect to?
+    attr_accessor :destination_host, :destination_port
+
+    # Should use TLS?
+    attr_accessor :tls
+
+    # TLS settings
+    attr_accessor :client_cert_chain, :client_private_key, :server_cert
+
+    # syslog defaults
+    attr_accessor :facility, :severity, :hostname
+
+    # Other settings
+    attr_accessor :strip_color, :parse_fields, :exclude_pattern
+
+    # Files
+    attr_reader :files
+
+    # How often should we check for new files?
+    attr_accessor :glob_check_interval
+
+    # Should we use eventmachine to tail?
+    attr_accessor :eventmachine_tail
+
+    def initialize(options = {})
+      @files = []
+      @glob_check_interval = 60
+      @eventmachine_tail = options.fetch(:eventmachine_tail, true)
+
+      unless logger = options[:logger]
+        logger = Logger.new(STDERR)
+        logger.level = Logger::ERROR
+      end
+
+      super('remote_syslog', :logger => logger, :pid_file => options[:pid_file])
+    end
+
+    def files=(files)
+      @files = [ @files, files ].flatten.compact.uniq
+    end
+
+    def watch_file(file)
+      if eventmachine_tail
+        RemoteSyslog::EventMachineReader.new(file,
+          :callback => @message_generator.method(:transmit),
+          :logger => logger)
+      else
+        RemoteSyslog::FileTailReader.new(file,
+          :callback => @message_generator.method(:transmit),
+          :logger => logger)
+      end
+    end
+
+    def run
+      EventMachine.run do
+        EM.error_handler do |e|
+          logger.error "Unhandled EventMachine Exception: #{e.class}: #{e.message}:\n\t#{e.backtrace.join("\n\t")}"
+        end
+
+        if @tls
+          max_message_size = 10240
+
+          connection = TlsEndpoint.new(@destination_host, @destination_port,
+            :client_cert_chain => @client_cert_chain,
+            :client_private_key => @client_private_key,
+            :server_cert => @server_cert,
+            :logger => logger)
+        else
+          max_message_size = 1024
+          connection = UdpEndpoint.new(@destination_host, @destination_port,
+            :logger => logger)
+        end
+
+        @message_generator = RemoteSyslog::MessageGenerator.new(connection, 
+          :facility => @facility, :severity => @severity, 
+          :strip_color => @strip_color, :hostname => @hostname, 
+          :parse_fields => @parse_fields, :exclude_pattern => @exclude_pattern,
+          :max_message_size => max_message_size)
+
+        files.each do |file|
+          RemoteSyslog::GlobWatch.new(file, @glob_check_interval, 
+            method(:watch_file))
+        end
+      end
+    end
+
+    def before_stopping
+      EM.stop
+    end
+  end
+end

data/lib/remote_syslog/cli.rb

@@ -1,8 +1,9 @@
 require 'optparse'
 require 'yaml'
 require 'pathname'
-require 'daemons'
+require 'servolux'
 
+require 'remote_syslog/agent'
 
 module RemoteSyslog
   class Cli
@@ -11,18 +12,29 @@ module RemoteSyslog
       'rfc3339' => /^(\S+) (\S+) ([^: ]+):? (.*)$/
     }
 
+    DEFAULT_PID_FILES = [
+      "/var/run/remote_syslog.pid",
+      "#{ENV['HOME']}/run/remote_syslog.pid",
+      "#{ENV['HOME']}/tmp/remote_syslog.pid",
+      "#{ENV['HOME']}/remote_syslog.pid",
+      "#{ENV['TMPDIR']}/remote_syslog.pid",
+      "/tmp/remote_syslog.pid"
+    ]
+
+    DEFAULT_CONFIG_FILE = '/etc/log_files.yml'
+
     def self.process!(argv)
       c = new(argv)
       c.parse
       c.run
     end
 
+    attr_reader :program_name
+
     def initialize(argv)
       @argv = argv
+      @program_name = File.basename($0)
 
-      @app_name = File.basename($0) || 'remote_syslog'
-
-      @configfile  = '/etc/log_files.yml'
       @strip_color = false
       @exclude_pattern = nil
 
@@ -32,168 +44,214 @@ module RemoteSyslog
         :backtrace    => false,
         :monitor      => false,
       }
+
+      @agent = RemoteSyslog::Agent.new(:pid_file => default_pid_file)
     end
 
-    def pid_file=(v)
-      m = v.match(%r{^(.+/)?([^/]+?)(\.pid)?$})
-      if m[1]
-        @daemonize_options[:dir_mode] = :normal
-        @daemonize_options[:dir] = m[1]
-      end
+    def is_file_writable?(file)
+      directory = File.dirname(file)
+
+      (File.directory?(directory) && File.writable?(directory) && !File.exists?(file)) || File.writable?(file)
+    end
 
-      @app_name = m[2]
+    def default_pid_file
+      DEFAULT_PID_FILES.each do |file|
+        return file if is_file_writable?(file)
+      end
     end
 
     def parse
       op = OptionParser.new do |opts|
-        opts.banner = "Usage: remote_syslog [options] [<logfile>...]"
-        opts.separator ''
-        opts.separator "Example: remote_syslog -c configs/logs.yml -p 12345 /var/log/mysqld.log"
+        opts.banner = "Usage: #{program_name} [OPTION]... <FILE>..."
         opts.separator ''
+
         opts.separator "Options:"
 
         opts.on("-c", "--configfile PATH", "Path to config (/etc/log_files.yml)") do |v|
-          @configfile = File.expand_path(v)
+          @configfile = v
         end
         opts.on("-d", "--dest-host HOSTNAME", "Destination syslog hostname or IP (logs.papertrailapp.com)") do |v|
-          @dest_host = v
+          @agent.destination_host = v
         end
         opts.on("-p", "--dest-port PORT", "Destination syslog port (514)") do |v|
-          @dest_port = v
+          @agent.destination_port = v
         end
         opts.on("-D", "--no-detach", "Don't daemonize and detach from the terminal") do
           @no_detach = true
         end
         opts.on("-f", "--facility FACILITY", "Facility (user)") do |v|
-          @facility = v
+          @agent.facility = v
         end
         opts.on("--hostname HOST", "Local hostname to send from") do |v|
-          @hostname = v
+          @agent.hostname = v
         end
-        opts.on("-P", "--pid-dir DIRECTORY", "Directory to write .pid file in (/var/run/)") do |v|
-          @daemonize_options[:dir_mode] = :normal
-          @daemonize_options[:dir] = v
+        opts.on("-P", "--pid-dir DIRECTORY", "DEPRECATED: Directory to write .pid file in") do |v|
+          puts "Warning: --pid-dir is deprecated. Please use --pid-file FILENAME instead"
+          @pid_directory = v
         end
-        opts.on("--pid-file FILENAME", "PID filename (<program name>.pid)") do |v|
-          self.pid_file = v
+        opts.on("--pid-file FILENAME", "Location of the PID file (default #{@agent.pid_file})") do |v|
+          @agent.pid_file = v
         end
         opts.on("--parse-syslog", "Parse file as syslog-formatted file") do
-          @parse_fields = FIELD_REGEXES['syslog']
+          @agent.parse_fields = FIELD_REGEXES['syslog']
         end
         opts.on("-s", "--severity SEVERITY", "Severity (notice)") do |v|
-          @severity = v
+          @agent.severity = v
         end
         opts.on("--strip-color", "Strip color codes") do
-          @strip_color = true
+          @agent.strip_color = true
         end
         opts.on("--tls", "Connect via TCP with TLS") do
-          @tls = true
+          @agent.tls = true
+        end
+
+
+        opts.on("--new-file-check-interval INTERVAL", OptionParser::DecimalInteger,
+          "Time between checks for new files") do |v|
+          @agent.glob_check_interval = v
         end
-        opts.on_tail("-h", "--help", "Show this message") do
+
+        opts.separator ''
+        opts.separator 'Advanced options:'
+
+        opts.on("--[no-]eventmachine-tail", "Enable or disable using eventmachine-tail") do |v|
+          @agent.eventmachine_tail = v
+        end
+        opts.on("--debug-log FILE", "Log internal debug messages") do |v|
+          level = @agent.logger.level
+          @agent.logger = Logger.new(v)
+          @agent.logger.level = level
+        end
+
+        severities = Logger::Severity.constants + Logger::Severity.constants.map { |s| s.downcase }
+        opts.on("--debug-level LEVEL", severities, "Log internal debug messages at level") do |v|
+          @agent.logger.level = Logger::Severity.const_get(v.upcase)
+        end
+
+        opts.separator ""
+        opts.separator "Common options:"
+
+        opts.on("-h", "--help", "Show this message") do
           puts opts
           exit
         end
+
+        opts.on("--version", "Show version") do
+          puts RemoteSyslog::VERSION
+          exit(0)
+        end
+
+        opts.separator ''
+        opts.separator "Example:"
+        opts.separator "    $ #{program_name} -c configs/logs.yml -p 12345 /var/log/mysqld.log"
       end
 
       op.parse!(@argv)
 
       @files = @argv.dup.delete_if { |a| a.empty? }
 
-      parse_config
-
-      @dest_host ||= 'logs.papertrailapp.com'
-      @dest_port ||= 514
+      if @configfile
+        if File.exists?(@configfile)
+          parse_config(@configfile)
+        else
+          error "The config file specified could not be found: #{@configfile}"
+        end
+      elsif File.exists?(DEFAULT_CONFIG_FILE)
+        parse_config(DEFAULT_CONFIG_FILE)
+      end
 
       if @files.empty?
-        puts "No filenames provided and #{@configfile} not found or malformed."
-        puts ''
-        puts op
-        exit
+        error "You must specify at least one file to watch"
       end
 
+      @agent.destination_host ||= 'logs.papertrailapp.com'
+      @agent.destination_port ||= 514
+
       # handle relative paths before Daemonize changes the wd to / and expand wildcards
       @files = @files.flatten.map { |f| File.expand_path(f) }.uniq
 
+      @agent.files = @files
+
+      if @pid_directory
+        if @agent.pid_file
+          @agent.pid_file = File.expand_path("#{@pid_directory}/#{@agent.pid_file}")
+        else
+          @agent.pid_file = File.expand_path("#{@pid_directory}/remote_syslog.pid")
+        end
+      end
+
+      @agent.pid_file ||= default_pid_file
+
+      if !@no_detach && !::Servolux.fork?
+        @no_detach = true
+
+        puts "Fork is not supported in this Ruby environment. Running in foreground."
+      end
+    rescue OptionParser::ParseError => e
+      error e.message, true
     end
 
-    def parse_config
-      if File.exist?(@configfile)
-        config = YAML.load_file(@configfile)
+    def parse_config(file)
+      config = YAML.load_file(file)
 
-        @files += Array(config['files'])
+      @files += Array(config['files'])
 
-        if config['destination'] && config['destination']['host']
-          @dest_host ||= config['destination']['host']
-        end
+      if config['destination'] && config['destination']['host']
+        @agent.destination_host ||= config['destination']['host']
+      end
 
-        if config['destination'] && config['destination']['port']
-          @dest_port ||= config['destination']['port']
-        end
+      if config['destination'] && config['destination']['port']
+        @agent.destination_port ||= config['destination']['port']
+      end
 
-        if config['hostname']
-          @hostname = config['hostname']
-        end
+      if config['hostname']
+        @agent.hostname = config['hostname']
+      end
 
-        @server_cert        = config['ssl_server_cert']
-        @client_cert_chain  = config['ssl_client_cert_chain']
-        @client_private_key = config['ssl_client_private_key']
+      @agent.server_cert        = config['ssl_server_cert']
+      @agent.client_cert_chain  = config['ssl_client_cert_chain']
+      @agent.client_private_key = config['ssl_client_private_key']
 
-        if config['parse_fields']
-          @parse_fields = FIELD_REGEXES[config['parse_fields']] || Regexp.new(config['parse_fields'])
-        end
+      if config['parse_fields']
+        @agent.parse_fields = FIELD_REGEXES[config['parse_fields']] || Regexp.new(config['parse_fields'])
+      end
 
-        if config['exclude_patterns']
-          @exclude_pattern = Regexp.new(config['exclude_patterns'].map { |r| "(#{r})" }.join('|'))
-        end
+      if config['exclude_patterns']
+        @agent.exclude_pattern = Regexp.new(config['exclude_patterns'].map { |r| "(#{r})" }.join('|'))
       end
     end
 
     def run
-      puts "Watching #{@files.length} files/paths. Sending to #{@dest_host}:#{@dest_port} (#{@tls ? 'TCP/TLS' : 'UDP'})."
-
       if @no_detach
-        start
+        puts "Watching #{@agent.files.length} files/paths. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.tls ? 'TCP/TLS' : 'UDP'})."
+        @agent.run
       else
-        Daemons.run_proc(@app_name, @daemonize_options) do
-          start
+        daemon = Servolux::Daemon.new(:server => @agent)
+
+        if daemon.alive?
+          error "Already running at #{@agent.pid_file}. To run another instance, specify a different `--pid-file`.", true
         end
+
+        puts "Watching #{@agent.files.length} files/paths. Sending to #{@agent.destination_host}:#{@agent.destination_port} (#{@agent.tls ? 'TCP/TLS' : 'UDP'})."
+        daemon.startup
       end
+    rescue Servolux::Daemon::StartupError => e
+      case message = e.message[/^(Child raised error: )?(.*)$/, 2]
+      when /#<Errno::EACCES: (.*)>$/
+        error $1
+      else
+        error message
+      end
+    rescue Interrupt
+      exit(0)
     end
 
-    def start
-      EventMachine.run do
-        if @tls
-          connection = TlsEndpoint.new(@dest_host, @dest_port,
-            :client_cert_chain => @client_cert_chain,
-            :client_private_key => @client_private_key,
-            :server_cert => @server_cert)
-        else
-          connection = UdpEndpoint.new(@dest_host, @dest_port)
-        end
-
-        @files.each do |path|
-          begin
-            glob_check_interval = 60
-            exclude_files       = []
-            max_message_size    = 1024
-
-            if @tls
-              max_message_size = 10240
-            end
-
-            EventMachine::FileGlobWatchTail.new(path, RemoteSyslog::Reader,
-              glob_check_interval, exclude_files,
-              @dest_host, @dest_port,
-              :socket => connection, :facility => @facility,
-              :severity => @severity, :strip_color => @strip_color,
-              :hostname => @hostname, :parse_fields => @parse_fields,
-              :exclude_pattern => @exclude_pattern,
-              :max_message_size => max_message_size)
-          rescue Errno::ENOENT => e
-            puts "#{path} not found, continuing. (#{e.message})"
-          end
-        end
+    def error(message, try_help = false)
+      puts "#{program_name}: #{message}"
+      if try_help
+        puts "Try `#{program_name} --help' for more information."
       end
+      exit(1)
     end
   end
 end

data/lib/remote_syslog/eventmachine_reader.rb

@@ -0,0 +1,43 @@
+require 'eventmachine'
+require 'eventmachine-tail'
+require 'em-dns-resolver'
+
+# Force eventmachine-tail not to change the encoding
+# This will allow ruby 1.9 to deal with any file data
+old_verbose, $VERBOSE = $VERBOSE, nil
+EventMachine::FileTail::FORCE_ENCODING = false
+$VERBOSE = old_verbose
+
+module RemoteSyslog
+  class EventMachineReader < EventMachine::FileTail
+    def initialize(path, options = {}, &block)
+      @callback = options[:callback] || block
+      @buffer = BufferedTokenizer.new
+      @logger = options[:logger] || Logger.new(STDERR)
+
+      @tag = options[:program] || File.basename(path)
+
+      # Remove characters that can't be in a tag
+      @tag = @tag.gsub(%r{[: \]\[\\]+}, '-')
+
+      # Make sure the tag isn't too long
+      if @tag.length > 32
+        @tag = @tag[0..31]
+      end
+
+      @logger.debug "Watching #{path} with EventMachineReader"
+
+      super(path, -1)
+    end
+
+    def receive_data(data)
+      @buffer.extract(data).each do |line|
+        @callback.call(@tag, line)
+      end
+    end
+
+    def on_exception(exception)
+      @logger.error "Exception: #{exception.class}: #{exception.message}\n\t#{exception.backtrace.join("\n\t")}"
+    end
+  end
+end

data/lib/remote_syslog/file_tail_reader.rb

@@ -0,0 +1,38 @@
+require 'file/tail'
+
+module RemoteSyslog
+  class FileTailReader
+    def initialize(path, options = {}, &block)
+      @path = path
+      @callback = options[:callback] || block
+      @logger   = options[:logger] || Logger.new(STDERR)
+      @tag      = options[:program] || File.basename(path)
+
+      # Remove characters that can't be in a tag
+      @tag = @tag.gsub(%r{[: \]\[\\]+}, '-')
+
+      # Make sure the tag isn't too long
+      if @tag.length > 32
+        @tag = @tag[0..31]
+      end
+
+      @logger.debug "Watching #{path} with FileTailReader"
+
+      start
+    end
+
+    def start
+      @thread = Thread.new do
+        run
+      end
+    end
+
+    def run
+      File::Tail::Logfile.tail(@path) do |line|
+        EventMachine.schedule do
+          @callback.call(@tag, line)
+        end
+      end
+    end
+  end
+end

data/lib/remote_syslog/glob_watch.rb

@@ -0,0 +1,18 @@
+require 'eventmachine-tail'
+
+module RemoteSyslog
+  class GlobWatch < EventMachine::FileGlobWatch
+    def initialize(path, interval, callback)
+      super(path, interval)
+      @callback = callback
+    end
+
+    def file_found(path)
+      @callback.call(path)
+    end
+
+    def file_deleted(path)
+      # Nothing to do
+    end
+  end
+end

data/lib/remote_syslog/message_generator.rb

@@ -0,0 +1,54 @@
+require 'socket'
+require 'syslog_protocol'
+
+module RemoteSyslog
+  class MessageGenerator
+    COLORED_REGEXP = /\e\[(?:(?:[0-9]{1,3});){0,2}(?:[0-9]{1,3})m/
+
+    def initialize(socket, options = {})
+      @socket = socket
+
+      @parse_fields     = options[:parse_fields]
+      @strip_color      = options[:strip_color]
+      @exclude_pattern  = options[:exclude_pattern]
+      @max_message_size = options[:max_message_size] || 1024
+
+      @packet = SyslogProtocol::Packet.new
+
+      if options[:hostname] && options[:hostname] != ''
+        local_hostname = options[:hostname]
+      else
+        local_hostname = (Socket.gethostname rescue `hostname`.chomp)[/^([^\.]+)/, 1]
+
+        if local_hostname.nil? || local_hostname == ''
+          local_hostname = 'localhost'
+        end
+      end
+
+      @packet.hostname = local_hostname
+      @packet.facility = options[:facility] || 'user'
+      @packet.severity = options[:severity] || 'notice'
+    end
+
+    def transmit(tag, message)
+      return if @exclude_pattern && message =~ @exclude_pattern
+
+      message = message.gsub(COLORED_REGEXP, '') if @strip_color
+
+      packet = @packet.dup
+      packet.content = message
+
+      if @parse_fields && message =~ @parse_fields
+        packet.hostname = $2 if $2 && $2 != ''
+        packet.tag      = $3 if $3 && $3 != ''
+        packet.content  = $4 if $4 && $4 != ''
+      end
+
+      unless packet.tag
+        packet.tag = tag
+      end
+
+      @socket.write(packet.assemble(@max_message_size))
+    end
+  end
+end

data/lib/remote_syslog/tls_endpoint.rb

@@ -1,3 +1,5 @@
+require 'eventmachine'
+
 module RemoteSyslog
   class TlsEndpoint
     class Handler < EventMachine::Connection
@@ -29,12 +31,15 @@ module RemoteSyslog
     attr_accessor :connection
     attr_reader :server_cert, :client_cert_chain, :client_private_key
 
+    attr_reader :logger
+
     def initialize(address, port, options = {})
       @address            = address
       @port               = port.to_i
       @client_cert_chain  = options[:client_cert_chain]
       @client_private_key = options[:client_private_key]
       @queue_limit        = options[:queue_limit] || 10_000
+      @logger             = options[:logger] || Logger.new(STDERR)
 
       if options[:server_cert]
         @server_cert = OpenSSL::X509::Certificate.new(File.read(options[:server_cert]))
@@ -51,6 +56,12 @@ module RemoteSyslog
       connect
     end
 
+    def connection=(conn)
+      port, ip = Socket.unpack_sockaddr_in(conn.get_peername)
+      logger.debug "Connected to #{ip}:#{port}"
+      @connection = conn
+    end
+
     def resolve_address
       request = EventMachine::DnsResolver.resolve(@address)
       request.callback do |addrs|
@@ -63,6 +74,7 @@ module RemoteSyslog
     end
 
     def connect
+      logger.debug "Connecting to #{address}:#{@port}"
       EventMachine.connect(address, @port, TlsEndpoint::Handler, self)
     end
 
@@ -86,4 +98,4 @@ module RemoteSyslog
       end
     end
   end
-end
+end

data/lib/remote_syslog/udp_endpoint.rb

@@ -1,9 +1,14 @@
+require 'eventmachine'
+
 module RemoteSyslog
   class UdpEndpoint
-    def initialize(address, port)
+    attr_reader :logger
+
+    def initialize(address, port, options = {})
       @address = address
       @port    = port.to_i
       @socket  = EventMachine.open_datagram_socket('0.0.0.0', 0)
+      @logger  = options[:logger] || Logger.new(STDERR)
 
       # Try to resolve the address
       resolve_address
@@ -29,4 +34,4 @@ module RemoteSyslog
       @socket.send_datagram(value, address, @port)
     end
   end
-end
+end

data/lib/remote_syslog.rb

@@ -1,7 +1,4 @@
 module RemoteSyslog
- VERSION = "1.6.5"
+ VERSION = "1.6.6.rc1"
 end
 
-require 'remote_syslog/reader'
-require 'remote_syslog/tls_endpoint'
-require 'remote_syslog/udp_endpoint'

data/remote_syslog.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'remote_syslog'
-  s.version           = '1.6.5'
-  s.date              = '2012-05-10'
+  s.version           = '1.6.6.rc1'
+  s.date              = '2012-08-13'
   s.rubyforge_project = 'remote_syslog'
 
   ## Make sure your summary is short. The description may be as long
@@ -40,7 +40,8 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   #s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
-  s.add_dependency 'daemons'
+  s.add_dependency 'servolux'
+  s.add_dependency 'file-tail'
   s.add_dependency 'eventmachine', [ '>= 0.12.10', '< 1.1' ]
   s.add_dependency 'eventmachine-tail'
   s.add_dependency 'syslog_protocol', [ '~> 0.9.2' ]
@@ -67,8 +68,12 @@ Gem::Specification.new do |s|
     examples/remote_syslog.supervisor.conf
     examples/remote_syslog.upstart.conf
     lib/remote_syslog.rb
+    lib/remote_syslog/agent.rb
     lib/remote_syslog/cli.rb
-    lib/remote_syslog/reader.rb
+    lib/remote_syslog/eventmachine_reader.rb
+    lib/remote_syslog/file_tail_reader.rb
+    lib/remote_syslog/glob_watch.rb
+    lib/remote_syslog/message_generator.rb
     lib/remote_syslog/tls_endpoint.rb
     lib/remote_syslog/udp_endpoint.rb
     remote_syslog.gemspec

metadata

@@ -1,89 +1,118 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: remote_syslog
-version: !ruby/object:Gem::Version
-  version: 1.6.5
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 1
+  - 6
+  - 6
+  - rc1
+  version: 1.6.6.rc1
 platform: ruby
-authors:
+authors: 
 - Troy Davis
 - Eric Lindvall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: &70356082564840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-08-13 00:00:00 -07:00
+default_executable: remote_syslog
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: servolux
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: file-tail
   prerelease: false
-  version_requirements: *70356082564840
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70356082564260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
     - - <
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *70356082564260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: eventmachine-tail
-  requirement: &70356082563580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70356082563580
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: syslog_protocol
-  requirement: &70356082563020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70356082563020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: em-resolv-replace
-  requirement: &70356082562600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70356082562600
-description: Lightweight daemon to tail one or more log files and transmit UDP syslog
-  messages to a remote syslog host (centralized log aggregation). Generates UDP packets
-  itself instead of depending on a system syslog daemon, so it doesn't affect system-wide
-  logging configuration.
-email:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+description: Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.
+email: 
 - troy@sevenscale.com
 - eric@sevenscale.com
-executables:
+executables: 
 - remote_syslog
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
 - LICENSE
-files:
+files: 
 - Gemfile
 - LICENSE
 - README.md
@@ -96,35 +125,46 @@ files:
 - examples/remote_syslog.supervisor.conf
 - examples/remote_syslog.upstart.conf
 - lib/remote_syslog.rb
+- lib/remote_syslog/agent.rb
 - lib/remote_syslog/cli.rb
-- lib/remote_syslog/reader.rb
+- lib/remote_syslog/eventmachine_reader.rb
+- lib/remote_syslog/file_tail_reader.rb
+- lib/remote_syslog/glob_watch.rb
+- lib/remote_syslog/message_generator.rb
 - lib/remote_syslog/tls_endpoint.rb
 - lib/remote_syslog/udp_endpoint.rb
 - remote_syslog.gemspec
+has_rdoc: true
 homepage: http://github.com/papertrail/remote_syslog
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: remote_syslog
-rubygems_version: 1.8.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
-summary: Monitor plain text log file(s) for new entries and send to remote syslog
-  collector
+summary: Monitor plain text log file(s) for new entries and send to remote syslog collector
 test_files: []
+

data/lib/remote_syslog/reader.rb

@@ -1,87 +0,0 @@
-require 'socket'
-require 'eventmachine'
-require 'eventmachine-tail'
-require 'em-dns-resolver'
-require 'syslog_protocol'
-
-# Force eventmachine-tail not to change the encoding
-# This will allow ruby 1.9 to deal with any file data
-old_verbose, $VERBOSE = $VERBOSE, nil
-EventMachine::FileTail::FORCE_ENCODING = false
-$VERBOSE = old_verbose
-
-module RemoteSyslog
-  class Reader < EventMachine::FileTail
-    COLORED_REGEXP = /\e\[(?:(?:[0-9]{1,3});){0,2}(?:[0-9]{1,3})m/
-
-    def initialize(path, destination_address, destination_port, options = {})
-      super(path, -1)
-
-      @parse_fields = options[:parse_fields]
-      @strip_color = options[:strip_color]
-      @exclude_pattern = options[:exclude_pattern]
-      @max_message_size = options[:max_message_size] || 1024
-
-      @socket = options[:socket] || UdpEndpoint.new(destination_address, destination_port)
-
-      @buffer = BufferedTokenizer.new
-
-      @packet = SyslogProtocol::Packet.new
-
-      if options[:hostname] && options[:hostname] != ''
-        local_hostname = options[:hostname]
-      else
-        local_hostname = (Socket.gethostname rescue `hostname`.chomp)[/^([^\.]+)/, 1]
-
-        if local_hostname.nil? || local_hostname.empty?
-          local_hostname = 'localhost'
-        end
-      end
-
-      @packet.hostname = local_hostname
-      @packet.facility = options[:facility] || 'user'
-      @packet.severity = options[:severity] || 'notice'
-
-      tag = options[:program] || File.basename(path) || File.basename($0)
-
-      # Remove characters that can't be in a tag
-      tag = tag.gsub(%r{[: \]\[\\]+}, '-')
-
-      # Make sure the tag isn't too long
-      if tag.length > 32
-        tag = tag[0..31]
-      end
-
-      @packet.tag = tag
-    end
-
-    def receive_data(data)
-      @buffer.extract(data).each do |line|
-        transmit(line)
-      end
-    end
-
-    def transmit(message)
-      return if @exclude_pattern && message =~ @exclude_pattern
-
-      message = message.gsub(COLORED_REGEXP, '') if @strip_color
-
-      packet = @packet.dup
-      packet.content = message
-
-      if @parse_fields
-        if message =~ @parse_fields
-          packet.hostname = $2 if $2 && $2 != ''
-          packet.tag      = $3 if $3 && $3 != ''
-          packet.content  = $4 if $4 && $4 != ''
-        end
-      end
-
-      @socket.write(packet.assemble(@max_message_size))
-    end
-
-    def on_exception(exception)
-      puts "Exception: #{exception.class}: #{exception.message}\n\t#{exception.backtrace.join("\n\t")}"
-    end
-  end
-end