jls-lumberjack 0.0.14 → 0.0.16

data/lib/lumberjack/server.rb

@@ -44,7 +44,18 @@ module Lumberjack
 
     def run(&block)
       while true
-        Thread.new(@ssl_server.accept) do |fd| 
+        # NOTE: This means ssl accepting is single-threaded.
+        begin
+          client = @ssl_server.accept
+        rescue EOFError, OpenSSL::SSL::SSLError, IOError
+          # ssl handshake failure or other issue, skip it.
+          # TODO(sissel): log the error
+          # TODO(sissel): try to identify what client was connecting that failed.
+          client.close rescue nil
+          next
+        end
+
+        Thread.new(client) do |fd|
           Connection.new(fd).run(&block)
         end
       end
@@ -209,11 +220,12 @@ module Lumberjack
           #send(event, *args)
         end # feed
       end # while true
-    rescue EOFError, OpenSSL::SSL::SSLError
+    rescue EOFError, OpenSSL::SSL::SSLError, IOError
       # EOF or other read errors, only action is to shutdown which we'll do in
       # 'ensure'
     ensure
-      @fd.close
+      # Try to ensure it's closed, but if this fails I don't care.
+      @fd.close rescue nil
     end # def run
 
     def window_size(size)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jls-lumberjack
 version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+  version: 0.0.16
+  prerelease:
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies: []
 description: lumberjack log transport library
 email:
@@ -22,26 +22,28 @@ files:
 - lib/lumberjack/client.rb
 homepage: https://github.com/jordansissel/lumberjack
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: lumberjack log transport library
 test_files: []