infopark_cloud_connector 6.8.0.348.160665197 → 6.8.0.356.19698103

data/lib/rails_connector/content_service.rb

@@ -1,30 +1,107 @@
 class ContentService
+  DEFAULT_PROTOCOL = 'https'.freeze
+  SOCKET_ERRORS = [EOFError, IOError, Errno::ECONNABORTED, Errno::ECONNRESET,
+      Errno::EPIPE, Errno::EINVAL].freeze
+
   def self.query(path, payload)
-    MultiJson.load(RestClient::Request.execute(
-      :method => :post,
-      :user => config['login'],
-      :password => config['api_key'],
-      :url => "#{config['url']}/#{path}",
-      :headers => {
-        :content_type => :json,
-        :accept => :json,
-        :user_agent => user_agent,
-      },
-      :payload => MultiJson.dump(payload)
-    ))
+    retry_once_on_socket_error do
+      ConnectionManager.ensure_started(uri)
+      request = build_request(path, payload)
+      response = ConnectionManager.connection.request(request)
+      MultiJson.load(response.body)
+    end
   end
 
-  private
+  class << self
+    private
 
-  def self.config
-    RailsConnector::Configuration.content_service
-  end
+    def retry_once_on_socket_error
+      retried = false
+      begin
+        yield
+      rescue *SOCKET_ERRORS
+        raise if retried
+        ConnectionManager.ensure_finished
+        retried = true
+        retry
+      end
+    end
+
+    def build_request(path, payload)
+      request = Net::HTTP::Post.new("#{uri.path}/#{path}".squeeze('/'), request_headers)
+      request.basic_auth(config['login'], config['api_key'])
+      request.body = MultiJson.dump(payload)
+      request
+    end
+
+    def uri
+      url = config['url']
+      url = "#{DEFAULT_PROTOCOL}://#{url}" unless url.match /^http/
+      URI.parse(url)
+    end
+
+    def request_headers
+      headers = {
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json',
+        'User-Agent' => user_agent,
+      }
+      if http_host = config['http_host']
+        headers['Host'] = http_host
+      end
+      headers
+    end
+
+    def config
+      RailsConnector::Configuration.content_service
+    end
 
-  def self.user_agent
-    @user_agent ||= (
-      gem_info = Gem.loaded_specs["infopark_cloud_connector"]
-      "#{gem_info.name}-#{gem_info.version}"
-    )
+    def user_agent
+      @user_agent ||= (
+        gem_info = Gem.loaded_specs["infopark_cloud_connector"]
+        "#{gem_info.name}-#{gem_info.version}"
+      )
+    end
   end
 
+  module ConnectionManager
+    def self.connection
+      @connection
+    end
+
+    def self.connection=(conn)
+      @connection = conn
+    end
+
+    def self.ensure_started(uri)
+      return if @connection && @connection.started?
+      conn = Net::HTTP.new(uri.host, uri.port)
+      if uri.scheme == 'https'
+        conn.use_ssl = true
+        conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+      retry_twice_on_socket_error { conn.start }
+      @connection = conn
+    end
+
+    def self.ensure_finished
+      @connection.finish if @connection && @connection.started?
+      @connection = nil
+    end
+
+    class << self
+      private
+
+      def retry_twice_on_socket_error
+        attempt = 0
+        begin
+          yield
+        rescue *ContentService::SOCKET_ERRORS
+          raise if attempt == 2
+          attempt += 1
+          retry
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 321329493
+  hash: 39396865
   prerelease: 
   segments: 
   - 6
   - 8
   - 0
-  - 348
-  - 160665197
-  version: 6.8.0.348.160665197
+  - 356
+  - 19698103
+  version: 6.8.0.356.19698103
 platform: ruby
 authors: 
 - Infopark AG
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-23 00:00:00 +01:00
+date: 2012-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,14 +57,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 321329493
+        hash: 39396865
         segments: 
         - 6
         - 8
         - 0
-        - 348
-        - 160665197
-        version: 6.8.0.348.160665197
+        - 356
+        - 19698103
+        version: 6.8.0.356.19698103
   version_requirements: *id003
   name: kvom
   prerelease: false