logporter 0.1.2 → 0.1.3

data/lib/logporter/protocol/syslog3164.rb

@@ -1,5 +1,60 @@
 require "logporter/namespace"
-require "time" # for Time.strptime
+
+# Ruby's core/stdlib Time.strptime is embarrasingly slow.
+# Let's do our own.
+class TimeParser
+  @@re_cache = {}
+  @@re_formats = {
+    "%b" => "(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)",
+    "%d" => "[ 1-3]?[0-9]",
+    "%H" => "[0-9]{2}",
+    "%M" => "[0-9]{2}",
+    "%S" => "[0-9]{2}",
+  }
+
+  def self.strptime(string, format)
+    if @@re_cache.include?(format)
+      obj = @@re_cache[format]
+    else
+      captures = []
+      pattern = format.gsub(/%[A-z]/) do |spec|
+        if @@re_formats.include?(spec)
+          captures << spec
+          "(#{@@re_formats[spec]})"
+        else
+          spec
+        end
+      end
+      re = Regexp.new(pattern)
+      obj = @@re_cache[format] = {
+        :re => re,
+        :captures => captures,
+      }
+    end
+
+    #m = obj[:re].match(string)
+    #return nil if !m
+
+    now = Time.new
+    time_array = [now.year, now.month, now.day, 0, 0, 0, 0]
+    return nil unless string.scan(obj[:re]) do |*captures|
+      #obj[:captures].each_with_index do |spec, i|
+        #p spec => m[i + 1]
+      captures.each_with_index do |spec, i|
+        case spec
+          when "%y"; time_array[0] = m[i + 1].to_i
+          when "%b"; time_array[1] = m[i + 1]
+          when "%d"; time_array[2] = m[i + 1].to_i
+          when "%H"; time_array[3] = m[i + 1].to_i
+          when "%M"; time_array[4] = m[i + 1].to_i
+          when "%S"; time_array[5] = m[i + 1].to_i
+        end # case spec
+      end # each capture
+    end # string.scan
+
+    return Time.local(*time_array)
+  end # def strptime
+end # class Time
 
 module LogPorter::Protocol::Syslog3164
   def syslog3164_init
@@ -10,6 +65,13 @@ module LogPorter::Protocol::Syslog3164
     minute = "(?:[0-5][0-9])"
     second = "(?:[0-5][0-9])"
 
+    #pri = "(?:<(?<pri>[0-9]{1,3})>)?"
+    #month = "(?:[A-z]{3})"
+    #day = "[ 1-9][0-9]"
+    #hour = "[0-9]{2}"
+    #minute = "[0-9]{2}"
+    #second = "[0-9]{2}"
+
     time = [hour, minute, second].join(":")
 
     timestamp = "(?<timestamp>#{month} #{day} #{time})"
@@ -23,19 +85,21 @@ module LogPorter::Protocol::Syslog3164
       # replace (?<foo> with (
       re = re.gsub(/\(\?<[^>]+>/, "(")
     end
-
     @syslog3164_re = Regexp.new(re)
   end
 
-  def parse_rfc3164(line, event)
+  def parse_rfc3164(line, event, opts)
     syslog3164_init if !@syslog3164_re
     m = @syslog3164_re.match(line)
     if m
       # RFC3164 section 4.3.3 No PRI or Unidentifiable PRI
       event.pri = m[1] || "13"
 
-      # TODO(sissel): DateTime is a very slow library, consider alternatives?
-      event.timestamp = Time.strptime(m[2], "%b %d %H:%M:%S")
+      if opts[:parse_time] 
+        event.timestamp = TimeParser.strptime(m[2], "%b %d %H:%M:%S")
+      else
+        event.timestamp = Time.now
+      end
       event.hostname = m[3]
       event.message = m[4]
       return true

data/lib/logporter/server/connection.rb

@@ -42,8 +42,12 @@ class LogPorter::Server::Connection < EventMachine::Connection
         class << self
           alias_method :receive_line, :receive_line_syslog
         end
+      when :syslog_no_parse_time
+        class << self
+          alias_method :receive_line, :receive_line_syslog
+        end
       else
-        raise "Unsupported protocol #{@server.protocol}"
+        raise "Unsupported protocol #{@server.wire}"
     end
 
       #@server.logger.error "Exception: #{e.inspect}"
@@ -72,16 +76,16 @@ class LogPorter::Server::Connection < EventMachine::Connection
       else
         client_port, client_address = Socket.unpack_sockaddr_in(peer)
       end
+      receive_line(data, client_address, client_port)
     else
       client_port = @client_port
       client_address = @client_address
+      @buffer ||= BufferedTokenizer.new
+      @buffer.extract(data).each do |line|
+        receive_line(line.chomp, client_address, client_port)
+      end
     end
-
-    @buffer ||= BufferedTokenizer.new
-    @buffer.extract(data).each do |line|
-      receive_line(line.chomp, client_address, client_port)
-    end
-  end
+  end # def receive_data
 
   def receive_line_raw(line, address, port)
     event = LogPorter::Event.new
@@ -100,7 +104,7 @@ class LogPorter::Server::Connection < EventMachine::Connection
 
   def receive_line_syslog(line, address, port)
     event = LogPorter::Event.new
-    if parse_rfc3164(line, event)
+    if parse_rfc3164(line, event, { :parse_time => (@server.wire == :syslog) })
     #elsif parse_rfc5424(line, event)
     else 
       # Unknown message format, add syslog headers.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logporter
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
+date: 2011-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/logporter/server.rb
 - lib/logporter/protocol/syslog3164.rb
 - lib/logporter/namespace.rb
-- lib/logporter/event.rb
+- lib/logporter/server.rb
 - lib/logporter/server/defaulthandler.rb
 - lib/logporter/server/connection.rb
+- lib/logporter/event.rb
 - test/syslog.rb
 has_rdoc: true
 homepage: https://github.com/loggly/logporter
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: logporter - a log server