swift-storage 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df7d503d429d4016d37c4fd440d39eed1c4b30d
-  data.tar.gz: 66bb39377d3493c4d028c2d166c686c1e5da8821
+  metadata.gz: da14f122449c3a28046bdde2a55627d9786063b5
+  data.tar.gz: 7c3d4bbdb737640d475d0d5f23c9749db619abb3
 SHA512:
-  metadata.gz: b850b928deca95b0ac052c49a19c905ca229d1832fdeb86b83157f2564b05cd15d9f1455f5578ad41d687cbeba3bc0e20484db141ccaeb4721a9a1ab5e43c7c6
-  data.tar.gz: caac9b19dd0788d241d934d65d76545765a7d1de06217bddda83d1fb77e50208ad5052d7f6a1b87603a3442bfeff54832ff66eb2e0c418bc8d5f13b0c9c3d872
+  metadata.gz: 445875d4a6c9b8a2bae8723ee8f181a8bf07bc4ad6fe81d6229ca6d69c756a12e893a1580c3a0069f899e6ef7428865d644f29c604b8dbe34c0ab4a03ff8b24b
+  data.tar.gz: 472938b6204624e0ba9797b150f39025ce56a625d2f3e94be781ca51e8f2cbef7f568591c96a0dc123ba212001749b7701cfbc33c4e1d68d26231ac978070670

data/CHANGELOG.md

@@ -3,10 +3,16 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.10
+
+  * Retry on connection error before giving up
+    [#11](https://github.com/memoways/swift-ruby/pull/11)
+    @ArmandPredicSis
+
 ## 0.0.9
 
   * Allow upload of large file (>5GB)
-    [#9](https://github.com/memoways/swift-ruby/pull/10)
+    [#10](https://github.com/memoways/swift-ruby/pull/10)
     @ArmandPredicSis
 
 ## 0.0.8

data/lib/swift_storage/configuration.rb

@@ -1,7 +1,7 @@
 module SwiftStorage
   class Configuration
     attr_accessor :auth_version, :tenant, :username, :password, :endpoint, :temp_url_key,
-                  :auth_method, :authtenant_type
+                  :auth_method, :authtenant_type, :retries
 
     def initialize
       @auth_version = ENV['SWIFT_STORAGE_AUTH_VERSION'] || '1.0'
@@ -10,6 +10,7 @@ module SwiftStorage
       @password = ENV['SWIFT_STORAGE_PASSWORD']
       @endpoint = ENV['SWIFT_STORAGE_ENDPOINT']
       @temp_url_key = ENV['SWIFT_STORAGE_TEMP_URL_KEY']
+      @retries = 3
 
       @auth_method = :password
       @authtenant_type = 'tenantName' # `tenantName` or `tenantId`

data/lib/swift_storage/service.rb

@@ -20,14 +20,17 @@ class SwiftStorage::Service
                        :storage_host,
                        :storage_port,
                        :storage_path,
-                       :temp_url_key
+                       :temp_url_key,
+                       :retries
 
   def initialize(tenant: configuration.tenant,
                  username: configuration.username,
                  password: configuration.password,
                  endpoint: configuration.endpoint,
-                 temp_url_key: configuration.temp_url_key)
+                 temp_url_key: configuration.temp_url_key,
+                 retries: configuration.retries)
     @temp_url_key = temp_url_key
+    @retries = retries
 
     %w(tenant username password endpoint).each do |n|
       eval("#{n} or raise ArgumentError, '#{n} is required'")
@@ -116,6 +119,9 @@ class SwiftStorage::Service
       json_data: nil,
       input_stream: nil,
       output_stream: nil)
+
+    tries = retries
+
     headers ||= {}
     headers.merge!(Headers::AUTH_TOKEN => auth_token) if authenticated?
     headers.merge!(Headers::CONTENT_TYPE => 'application/json') if json_data
@@ -183,7 +189,15 @@ class SwiftStorage::Service
       end
     end
 
-    response = s.request(req, &output_proc)
+    begin
+      response = s.request(req, &output_proc)
+    rescue Errno::EPIPE, Errno::EAGAIN, Errno::EWOULDBLOCK, Timeout::Error, Errno::EINVAL, EOFError
+      # Server closed the connection, retry
+      sleep 5
+      retry unless (tries -= 1) <= 0
+      raise OpenStack::Exception::Connection, "Unable to connect to OpenStack::Swift after #{retries} retries"
+    end
+
     begin
       check_response!(response)
     rescue AuthError

data/lib/swift_storage/version.rb

@@ -1,3 +1,3 @@
 module SwiftStorage
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Nicolas Goy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler