logporter 0.1.1 → 0.1.2

data/lib/logporter/protocol/syslog3164.rb

@@ -1,4 +1,5 @@
 require "logporter/namespace"
+require "time" # for Time.strptime
 
 module LogPorter::Protocol::Syslog3164
   def syslog3164_init
@@ -32,7 +33,9 @@ module LogPorter::Protocol::Syslog3164
     if m
       # RFC3164 section 4.3.3 No PRI or Unidentifiable PRI
       event.pri = m[1] || "13"
-      event.timestamp = m[2]
+
+      # TODO(sissel): DateTime is a very slow library, consider alternatives?
+      event.timestamp = Time.strptime(m[2], "%b %d %H:%M:%S")
       event.hostname = m[3]
       event.message = m[4]
       return true

data/lib/logporter/server.rb

@@ -1,6 +1,7 @@
 require "logporter/namespace"
 require "logporter/server/connection"
 require "logporter/server/defaulthandler"
+require "logger"
 
 class LogPorter::Server
 
@@ -23,6 +24,9 @@ class LogPorter::Server
   # This is a hash
   attr_reader :attributes
 
+  # The logger object
+  attr_accessor :logger
+
   # Create a new server to listen with
   # 'options' is a hash of:
   #
@@ -31,6 +35,7 @@ class LogPorter::Server
   #   :wire => the wire format (:raw, :syslog)
   #   :handler => the handler instance. Must respond to 'receive_event'
   def initialize(options)
+    @logger = Logger.new(STDOUT)
     @network = options[:net]
     @port = options[:port] || 514
     @wire = options[:wire] || :raw
@@ -57,25 +62,32 @@ class LogPorter::Server
     #   s.start
     #
     #   EventMachine.run()
-    EventMachine.next_tick do
-      puts "Starting #{@network}/#{@port}"
-      begin
-        case @network
-          when :udp; start_udp_server
-          when :tcp; start_tcp_server
-          when :tls; start_tcp_server # tls is handled by tcp.
-          else
-            raise "Unknown network '#{@network}' expected :udp, :tcp, or :tls"
-        end
-      rescue => e
-        if @handler.respond_to?(:receive_exception)
-          @handler.receive_exception(e)
+    if EventMachine.reactor_running?
+      _start
+    else
+      EventMachine.next_tick { _start }
+    end
+  end # def start
+
+  private
+  def _start
+    @logger.info "Starting #{@network}/#{@port}"
+    begin
+      case @network
+        when :udp; start_udp_server
+        when :tcp; start_tcp_server
+        when :tls; start_tcp_server # tls is handled by tcp.
         else
-          raise e
-        end
+          raise "Unknown network '#{@network}' expected :udp, :tcp, or :tls"
+      end
+    rescue => e
+      if @handler.respond_to?(:receive_exception)
+        @handler.receive_exception(e, self)
+      else
+        raise e
       end
     end
-  end # def start
+  end # def _start
 
   private
   def start_udp_server
@@ -93,10 +105,11 @@ class LogPorter::Server
   public
   def receive_event(event, client_addr, client_port)
     @handler.receive_event(event, self, client_addr, client_port)
-  end
+  end # def receive_event
 
   public
   def stop
+    @logger.info "Stopping #{@network}/#{@port}"
     case @network
       when :tcp
         EventMachine::stop_server(@socket)

data/lib/logporter/server/connection.rb

@@ -46,6 +46,8 @@ class LogPorter::Server::Connection < EventMachine::Connection
         raise "Unsupported protocol #{@server.protocol}"
     end
 
+      #@server.logger.error "Exception: #{e.inspect}"
+      #@server.logger.error "Backtrace: #{e.backtrace}"
     if @server.network != :udp
       peer = get_peername
       if peer.is_a?(Array) # new em-netty::Connection.get_peername
@@ -115,8 +117,8 @@ class LogPorter::Server::Connection < EventMachine::Connection
   def stats
     @start ||= Time.now
     @count += 1
-    if @count % 50000 == 0
-      puts "Rate: #{@count / (Time.now - @start)}"
+    if (Time.now - @start) > 10
+      @server.logger.info "Rate: #{@count / (Time.now - @start)}"
       @start = Time.now
       @count = 0
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logporter
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -07:00
+date: 2011-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency