logporter 0.0.2 → 0.1.1

data/lib/logporter/protocol/syslog3164.rb

@@ -1,5 +1,4 @@
 require "logporter/namespace"
-require "time" # for Time.strptime
 
 module LogPorter::Protocol::Syslog3164
   def syslog3164_init
@@ -33,9 +32,7 @@ module LogPorter::Protocol::Syslog3164
     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")
+      event.timestamp = m[2]
       event.hostname = m[3]
       event.message = m[4]
       return true

data/lib/logporter/server.rb

@@ -1,7 +1,6 @@
 require "logporter/namespace"
 require "logporter/server/connection"
 require "logporter/server/defaulthandler"
-require "logger"
 
 class LogPorter::Server
 
@@ -24,9 +23,6 @@ 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:
   #
@@ -35,12 +31,11 @@ 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.delete(:port) || 514
-    @wire = options.delete(:wire) || :raw
-    @handler = options.delete(:handler) || LogPorter::Server::DefaultHandler.new
-    @attributes = options.delete(:attributes) || Hash.new
+    @port = options[:port] || 514
+    @wire = options[:wire] || :raw
+    @handler = options[:handler] || LogPorter::Server::DefaultHandler.new
+    @attributes = options[:attributes] || Hash.new
 
     if @network == :tls
       @tls = TLSConfig.new
@@ -62,32 +57,25 @@ class LogPorter::Server
     #   s.start
     #
     #   EventMachine.run()
-    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.
+    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)
         else
-          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
+          raise e
+        end
       end
     end
-  end # def _start
+  end # def start
 
   private
   def start_udp_server
@@ -105,11 +93,10 @@ class LogPorter::Server
   public
   def receive_event(event, client_addr, client_port)
     @handler.receive_event(event, self, client_addr, client_port)
-  end # def receive_event
+  end
 
   public
   def stop
-    @logger.info "Stopping #{@network}/#{@port}"
     case @network
       when :tcp
         EventMachine::stop_server(@socket)

data/lib/logporter/server/connection.rb

@@ -1,4 +1,5 @@
-require "eventmachine"
+require "eventmachine" if !(EventMachine::Connection rescue nil)
+require "em/buftok" # for BufferedTokenizer
 require "logporter/event"
 require "logporter/namespace"
 require "logporter/protocol/syslog3164"
@@ -10,6 +11,7 @@ class LogPorter::Server::Connection < EventMachine::Connection
  
   def initialize(server)
     @server = server
+    super()
   end
 
   def post_init
@@ -30,6 +32,7 @@ class LogPorter::Server::Connection < EventMachine::Connection
     
     @count = 0
 
+    # TODO(sissel): Document why this.
     case @server.wire
       when :raw
         class << self
@@ -43,11 +46,14 @@ class LogPorter::Server::Connection < EventMachine::Connection
         raise "Unsupported protocol #{@server.protocol}"
     end
 
-    begin
-      @client_port, @client_address = Socket.unpack_sockaddr_in(get_peername)
-      @server.logger.info "New client: #{@client_address}:#{@client_port}"
-    rescue => e
-      p e
+    if @server.network != :udp
+      peer = get_peername
+      if peer.is_a?(Array) # new em-netty::Connection.get_peername
+        @client_address, @client_port = peer
+      else
+        @client_port, @client_address = Socket.unpack_sockaddr_in(peer)
+      end
+      puts "New client: #{@client_address}:#{@client_port}"
     end
   end # def post_init
 
@@ -58,7 +64,12 @@ class LogPorter::Server::Connection < EventMachine::Connection
 
   def receive_data(data)
     if @server.network == :udp
-      client_port, client_address = Socket.unpack_sockaddr_in(get_peername)
+      peer = get_peername
+      if peer.is_a?(Array) # new em-netty::Connection.get_peername
+        client_address, client_port = peer
+      else
+        client_port, client_address = Socket.unpack_sockaddr_in(peer)
+      end
     else
       client_port = @client_port
       client_address = @client_address
@@ -104,8 +115,8 @@ class LogPorter::Server::Connection < EventMachine::Connection
   def stats
     @start ||= Time.now
     @count += 1
-    if (Time.now - @start) > 10
-      @server.logger.info "Rate: #{@count / (Time.now - @start)}"
+    if @count % 50000 == 0
+      puts "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: 27
-  prerelease: 
+  hash: 25
+  prerelease: false
   segments: 
   - 0
-  - 0
-  - 2
-  version: 0.0.2
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,11 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: None yet.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: syslog servlet for ruby
 email: jordan@loggly.com
 executables: []
 
@@ -28,12 +41,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/logporter/server.rb
 - lib/logporter/protocol/syslog3164.rb
 - lib/logporter/namespace.rb
-- lib/logporter/server.rb
+- lib/logporter/event.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
@@ -66,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: logporter - a log server