ec2-api-proxy 0.1.2 → 0.1.3

data/README

@@ -33,8 +33,13 @@ gem install ec2-api-proxy
   debug: false
   shell> eapctl debug true
   
-  shell> export HTTP_PROXY=localhost:8080
-  shell> aws ec2 describe-instances --endpoint-url=http://ec2.ap-northeast-1.amazonaws.com # It does not support HTTPS still
+  shell> aws --version
+  shell> aws-cli/0.12.0 Python/2.6.8 Linux/3.4.43-43.43.amzn1.x86_64
+         # HTTP(S)_PROXY is not is not supported by old version awc cli
+  
+  shell> export HTTP_PROXY=http://localhost:8080
+  shell> aws ec2 describe-instances --endpoint-url=http://ec2.ap-northeast-1.amazonaws.com
+         # HTTPS_PROXY is still unstable. 
   {
       "Reservations": [
           {
@@ -48,6 +53,7 @@ gem install ec2-api-proxy
   shell> tail -f /var/log/ec2-api-proxy.log
   ...
   D, [2013-07-15T20:41:28.472712 #76304] DEBUG -- : proxy: connect from 127.0.0.1:58456
+  D, [2013-07-15T20:41:28.472712 #76304] DEBUG -- : proxy: DescribeInstances (allow_cache=true)
   D, [2013-07-15T20:41:28.529715 #76304] DEBUG -- : proxy: cache miss
   D, [2013-07-15T20:41:29.051745 #76304] DEBUG -- : proxy: unbind connection from 127.0.0.1:58456
   D, [2013-07-15T20:41:29.051745 #76304] DEBUG -- : backend: unbind connection

data/lib/ec2-api-proxy/backend.rb

@@ -16,7 +16,14 @@ module EC2APIProxy
 
       if @memcached_key and not @data_list.empty?
         data = @data_list.join
-        @proxy.memcached.set(@memcached_key, data, @proxy.options[:expires])
+
+        if /<Response>\s*<Errors>\s*<Error>/ =~ data
+          if @proxy and @proxy.options[:debug]
+            @logger.debug("backend: error response: #{data}")
+          end
+        else
+          @proxy.memcached.set(@memcached_key, data, @proxy.options[:expires])
+        end
 
         if @proxy and @proxy.options[:debug]
           @logger.debug("backend: set cache (length=#{data.length})")
@@ -26,7 +33,7 @@ module EC2APIProxy
 
     def receive_data(data)
       if not @proxy or @proxy.error?
-        @logger.info("backend: proxy connection error: #{data.inspect}")
+        @logger.error("backend: proxy connection error: #{data.inspect}")
         close_proxy_connection
         close_connection_after_writing
       else
@@ -40,7 +47,7 @@ module EC2APIProxy
     def close_proxy_connection
       @proxy.close_connection if @proxy
     rescue Exception => e
-      @logger.warn("#{e.class.name}: #{e.message}")
+      @logger.warn("#{e.class.name}: #{e.message}\n\tfrom #{e.backtrace.join("\n\tfrom ")}")
     end
   end # Backend
 end # EC2APIProxy

data/lib/ec2-api-proxy/constants.rb

@@ -1,2 +1,2 @@
 APP_NAME = 'ec2-api-proxy'
-Version = '0.1.2'
+Version = '0.1.3'

data/lib/ec2-api-proxy/proxy.rb

@@ -10,10 +10,12 @@ module EC2APIProxy
     attr_reader :logger
     attr_reader :memcached
 
-    def initialize(options)
+    def initialize(options, memcached)
       @options = options
-      @memcached = Dalli::Client.new(options[:memcached], :compress => options[:compress])
+      @memcached = memcached
       @logger = Logger.new($stdout)
+      @data_len = nil
+      @data = ''
     end
 
     def post_init
@@ -37,9 +39,20 @@ module EC2APIProxy
     end
 
     def receive_data(data)
+      @data << data
+
+      unless @data_len
+        content_length = data.split("\r\n").find {|i| /\AContent-Length:/i =~ i }
+        @data_len = content_length ? content_length.split(/:\s+/, 2).last.to_i : 0
+      end
+
+      content = @data.split("\r\n\r\n", 2).last || ''
+      @logger.debug("proxy: receive data (length=#{@data_len}, receive=#{content.length})") if @options[:debug]
+      return if content.length < @data_len
+
       EM.defer {
         begin
-          endpoint, params = parse_proxy_request(data)
+          endpoint, params = parse_proxy_request(@data)
           action = (params['Action'] || []).first
           allow_cache = !!(/\ADescribe/ =~ action)
           key = params_to_key(params)
@@ -61,16 +74,16 @@ module EC2APIProxy
                        )
 
             if @backend.error?
-              @logger.error("proxy: backend connection error: #{data.inspect}")
+              @logger.error("proxy: backend connection error: #{@data.inspect}")
               send_error('ec2-api-proxy-backend-connection-error', 'backend connection error')
               close_backend_connection
               close_connection_after_writing
             else
-              @backend.send_data(data)
+              @backend.send_data(@data)
             end
           end
         rescue => e
-          @logger.warn("#{e.class.name}: #{e.message}")
+          @logger.error("#{e.class.name}: #{e.message}\n\tfrom #{e.backtrace.join("\n\tfrom ")}")
           send_error(e.class.name, e.message)
           close_backend_connection
           close_connection_after_writing
@@ -81,22 +94,15 @@ module EC2APIProxy
     private
 
     def parse_proxy_request(data)
-      request_method = nil
-      endpoint = nil
-
-      data.sub!(%r{\A(GET|POST) (https?://[^/]+)}) do
-        request_method = $1
-        endpoint = $2
-        "#{request_method} "
-      end
-
+      request_line, header_body = data.split("\r\n", 2)
+      request_method, endpoint, http_version = request_line.split(/\s+/, 3)
       endpoint = URI.parse(endpoint)
       params = nil
 
       if request_method =~ /GET/i
         params = CGI.parse(endpoint.query)
       else
-        params = CGI.parse(data.split(/\r\n\r\n/, 2).last)
+        params = CGI.parse(header_body.split(/\r\n\r\n/, 2).last)
       end
 
       [endpoint, params]
@@ -133,7 +139,7 @@ module EC2APIProxy
     def close_backend_connection
       @backend.close_connection if @backend
     rescue Exception => e
-      @logger.warn("#{e.class.name}: #{e.message}")
+      @logger.warn("#{e.class.name}: #{e.message}\n\tfrom #{e.backtrace.join("\n\tfrom ")}")
     end
   end # Proxy
 end # EC2APIProxy

data/lib/ec2-api-proxy/server.rb

@@ -39,7 +39,8 @@ module EC2APIProxy
         EM.threadpool_size = @@options[:threads] if @@options[:threads]
 
         EM.run {
-          EM.start_server(@@options[:addr], @@options[:port], EC2APIProxy::Proxy, @@control_options)
+          memcached = Dalli::Client.new(@@options[:memcached], :compress => @@options[:compress])
+          EM.start_server(@@options[:addr], @@options[:port], EC2APIProxy::Proxy, @@control_options, memcached)
         }
       end
     end # self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-api-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -68,12 +68,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README
-- bin/eapctl
 - bin/ec2-api-proxy
+- bin/eapctl
 - lib/ec2-api-proxy/backend.rb
-- lib/ec2-api-proxy/constants.rb
-- lib/ec2-api-proxy/proxy.rb
 - lib/ec2-api-proxy/server.rb
+- lib/ec2-api-proxy/proxy.rb
+- lib/ec2-api-proxy/constants.rb
 homepage: https://bitbucket.org/winebarrel/ec2-api-proxy
 licenses: []
 post_install_message: