resilient_socket 0.3.0 → 0.3.1

data/README.md

@@ -37,7 +37,7 @@ to adjust the retry logic
 ### Dependencies
 
 - Ruby MRI 1.8.7 (or above), Ruby 1.9.3,  Or JRuby 1.6.3 (or above)
-- [SemanticLogger](http://github.com/ClarityServices/semantic-logger)
+- [SemanticLogger](http://github.com/ClarityServices/semantic_logger)
 
 ### Install
 

data/Rakefile

@@ -19,7 +19,7 @@ task :gem  do |t|
     spec.date        = Date.today.to_s
     spec.summary     = "A Resilient TCP Socket Client with built-in timeouts, retries, and logging"
     spec.description = "A Resilient TCP Socket Client with built-in timeouts, retries, and logging"
-    spec.files       = FileList["./**/*"].exclude('*.gem', 'nbproject').map{|f| f.sub(/^\.\//, '')}
+    spec.files       = FileList["./**/*"].exclude(/.gem$/, /.log$/,/^nbproject/).map{|f| f.sub(/^\.\//, '')}
     spec.has_rdoc    = true
     spec.add_dependency 'semantic_logger'
   end

data/lib/resilient_socket/tcp_client.rb

@@ -546,17 +546,19 @@ module ResilientSocket
         socket_address = Socket.pack_sockaddr_in(port, address[0][3])
 
         begin
+          @socket = Socket.new(Socket.const_get(address[0][0]), Socket::SOCK_STREAM, 0)
+          @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) unless buffered
           begin
-            @socket = Socket.new(Socket.const_get(address[0][0]), Socket::SOCK_STREAM, 0)
-            @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) unless buffered
             @socket.connect_nonblock(socket_address)
           rescue Errno::EINPROGRESS
-            resp = IO.select(nil, [@socket], nil, @connect_timeout)
-            raise(ConnectionTimeout.new("Timedout after #{@connect_timeout} seconds trying to connect to #{server}")) unless resp
+          end
+          if IO.select(nil, [@socket], nil, @connect_timeout)
             begin
               @socket.connect_nonblock(socket_address)
             rescue Errno::EISCONN
             end
+          else
+            raise(ConnectionTimeout.new("Timedout after #{@connect_timeout} seconds trying to connect to #{server}")) unless resp
           end
           break
         rescue SystemCallError => exception

data/lib/resilient_socket/version.rb

@@ -1,3 +1,3 @@
 module ResilientSocket #:nodoc
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resilient_socket
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger
@@ -47,11 +47,8 @@ files:
 - nbproject/project.xml
 - Rakefile
 - README.md
-- resilient_socket-0.2.0.gem
-- resilient_socket-0.2.1.gem
 - test/simple_tcp_server.rb
 - test/tcp_client_test.rb
-- test.log
 - test.log.working
 homepage: https://github.com/ClarityServices/resilient_socket
 licenses: []