uber-s3 0.2.3 → 0.2.4

data/lib/uber-s3/connection/net_http.rb

@@ -12,15 +12,7 @@ module UberS3::Connection
       self.uri = URI.parse(url)
 
       # Init and open a HTTP connection
-      self.http ||= Net::HTTP.new(uri.host, uri.port)
-      if !http.started? || !http.active?
-        http.start
-
-        if Socket.const_defined?(:TCP_NODELAY)
-          socket = http.instance_variable_get(:@socket)
-          socket.io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-        end
-      end
+      http_connect! if http.nil? || !http.started?
 
       req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)
       req = req_klass.new(uri.to_s, headers)
@@ -28,9 +20,15 @@ module UberS3::Connection
       req.body = body if !body.nil? && !body.empty?
 
       # Make HTTP request
-      r = http.request(req)
-
-      # $stderr.puts "active? " + http.active?.to_s
+      retries = 2
+      begin
+        r = http.request(req)
+      rescue EOFError, Errno::EPIPE
+        # Something happened to our connection, lets try this again
+        http_connect!
+        retries -= 1
+        retry if retries >= 0
+      end
 
       # Auto-decode any gzipped objects
       if verb == :get && r.header['Content-Encoding'] == 'gzip'
@@ -47,6 +45,18 @@ module UberS3::Connection
         :raw    => r
       })
     end
+
+    private
+
+      def http_connect!
+        self.http = Net::HTTP.new(uri.host, uri.port)
+        http.start
+
+        if Socket.const_defined?(:TCP_NODELAY)
+          socket = http.instance_variable_get(:@socket)
+          socket.io.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+        end
+      end
     
   end
 end

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types