mongrel_esi 0.5.1 → 0.5.2

data/lib/esi/processor.rb

@@ -47,7 +47,7 @@ module ESI
       STDERR.puts "\n#{e.message}: #{e.backtrace.join("\n")}\n"
     ensure 
       http_response.write( "0\r\n\r\n" )
-      http_response.done = true
+      http_response.done = true if http_response.respond_to?(:done)
     end
 
     def send_chunk

data/lib/esi/proxy.rb

@@ -3,13 +3,13 @@
 require 'uri'
 require 'timeout'
 require 'net/http'
-require 'mongrel'
 require 'esi/logger'
 require 'esi/cache'
 require 'esi/config'
 require 'esi/router'
 require 'esi/processor'
 require 'esi/version'
+require 'mongrel'
 
 module ESI
 
@@ -24,24 +24,36 @@ module ESI
       @cache_buffer = nil
     end
 
-    def process(request, response)
+    def process(url, request, response)
  
-      start = Time.now
       status = 200
 
       http_params = http_params(request.params)
 
-      url = @router.url_for(request.params["REQUEST_URI"])
-      #log_debug "#{request.params["REQUEST_METHOD"]} => #{url}"
       chunk_count = 0
       bytes_sent = 0
+      sent_from_cache = false
       uri = URI.parse(url)
 
       path_with_query = uri.query ? "#{uri.path}?#{uri.query}" :  uri.path
  
-      if @config.cache.cached?( path_with_query, http_params )
-        cache_buffer = @config.cache.get( path_with_query, http_params ).body
-        bytes_sent = send_esi_buffered( status, response, request, http_params, cache_buffer )
+      # check if the origin is cached
+      cached_page = @config.cache.get( path_with_query, http_params )
+      if cached_page and cached_page.valid?
+        cache_buffer = cached_page.body
+        head, body = cache_buffer.split("\r\n\r\n")
+        buffer = StringIO.new
+        bytes_sent = send_esi_buffered( buffer, request, http_params, body )
+        buffer.rewind
+        bytes_sent = buffer.size
+        #puts bytes_sent.inspect
+        head = head.sub(/Content-Length:.*$/,"Content-Length: #{bytes_sent}")
+        #puts head
+        response.write head
+        response.write "\r\n\r\n"
+        response.write buffer.read
+        response.done = true if response.respond_to?(:done)
+        sent_from_cache = true
       else
         proxy_request = (request.params["REQUEST_METHOD"] == "POST") ?
                             Net::HTTP::Post.new( path_with_query, http_params ) :
@@ -58,11 +70,7 @@ module ESI
         end
 
       end
-
-    rescue => e
-      STDERR.puts "\n#{e.message}: error at #{e.backtrace.first} msg at #{__FILE__}:#{__LINE__}\n"
-    ensure
-      log_request "\n#{url}, #{Time.now - start} seconds with status #{status} and #{chunk_count} chunks, #{bytes_sent} bytes\n"
+      [chunk_count, bytes_sent, status, sent_from_cache]
     end
 
   protected
@@ -82,37 +90,45 @@ module ESI
         end
       end
 
+      # build the initial HTTP HEAD response
+      header = Mongrel::Const::STATUS_FORMAT % [status, Mongrel::HTTP_STATUS_CODES[status]]
+      headers.each {|k,v| header << "#{k}: #{v}\r\n" }
 
       if status >= 500 or !@config.enable_esi_processor?( proxy_response )
-        headers.each do|k,v|
-          http_response.header[k] = v
-        end
-        proxy_direct( http_response, status, proxy_response )
+        http_response.write header 
+        http_response.write "\r\n" 
+        proxy_direct( http_response, proxy_response )
+      elsif http_request.params["HTTP_VERSION"] == "HTTP/1.0" and http_request.params["REQUEST_METHOD"] != "HEAD"
+        body = proxy_response.read_body
+        buffer = StringIO.new
+        send_esi_buffered( buffer, http_request, http_params, body )
+        buffer.rewind
+        header << "Content-Length: #{buffer.size}\r\n\r\n"
+        http_response.write( header )
+        buffer = buffer.read # replace with in memory
+        http_response.write( buffer )
+        @cache_buffer << header if @cache_buffer
+        @cache_buffer << buffer if @cache_buffer
+        [0,buffer.size]
       else
-        if http_request.params["HTTP_VERSION"].match(/1.0/)
-          buffer = proxy_response.read_body
-          bytes=send_esi_buffered( status, http_response, http_request, http_params, buffer )
-          @cache_buffer << buffer if @cache_buffer
-          [0,bytes]
-        else
-          header = Mongrel::Const::STATUS_FORMAT % [status, Mongrel::HTTP_STATUS_CODES[status]]
-          headers.each {|k,v| header << "#{k}: #{v}\r\n" }
-          header << "Transfer-Encoding: chunked\r\n\r\n"
-          http_response.write( header )
-          proxy_filter_esi( http_request, http_response, http_params, proxy_response )
-        end
+        # write current http header into the cache
+        @cache_buffer << header if @cache_buffer
+        header << "Transfer-Encoding: chunked\r\n\r\n" # don't save this to the cache
+        # now we don't know the content-length yet, but we save a spot for it
+        @cache_buffer << "Content-Length: \r\n\r\n" if @cache_buffer
+        http_response.write( header )
+        return [0,0] if http_request.params["REQUEST_METHOD"] == "HEAD"
+        proxy_filter_esi( http_request, http_response, http_params, proxy_response )
       end
-
     end
 
-    def proxy_direct( http_response, status, proxy_response )
+    def proxy_direct( http_response, proxy_response )
       bytes_sent = 0
-      http_response.start(status, true) do|head,out|
-        proxy_response.read_body do|fragment|
-          out << fragment
-          bytes_sent += fragment.size
-        end
+      proxy_response.read_body do|fragment|
+        http_response.write fragment
+        bytes_sent += fragment.size
       end
+      http_response.done = true if http_response.respond_to?(:done)
       return [0,bytes_sent]
     end
 
@@ -121,20 +137,14 @@ module ESI
       processor.send_body( http_request, http_params, http_response, proxy_response )
     end
     
-    def send_esi_buffered( status, response, request, http_params, buffer )
-      bytes = 0
-      response.start(status, true) do|head,out|
-        head["Server"] = SERVER
-        parser = ESI::Parser.new( out, @router, @config.cache, 3 )
-        parser.prepare( request.params, http_params )
-        parser.process buffer
-        parser.finish
-        bytes = out.size
-      end
-      bytes
+    def send_esi_buffered( response, request, http_params, buffer )
+      parser = ESI::Parser.new( response, @router, @config.cache, 3 )
+      parser.prepare( request.params, http_params )
+      parser.process buffer
+      parser.finish
+      response.done = true if response.respond_to?(:done)
     end
 
-
     def read_status(response)
       Net::HTTPResponse::CODE_TO_OBJ.select { |k,v| v == response.class }.first[0].to_i rescue 500
     end

data/lib/esi/rack_adapter.rb

@@ -0,0 +1,97 @@
+require 'rubygems'
+require 'rack'
+require 'rack/request'
+require 'rack/response'
+if $0 == __FILE__
+  $:.unshift File.join(File.dirname(__FILE__),'..')
+  $:.unshift File.join(File.dirname(__FILE__),'..','..','ext')
+end
+require 'esi/logger'
+require 'esi/config'
+require 'esi/proxy'
+
+module ESI
+  # override how config works for rack
+  class RackConfig
+    def self.enable
+      ESI::Config.class_eval do
+        def self.config
+          @@config ||= ESI::Config.new( {} )
+        end
+        def self.define(listeners=nil)
+          puts ESI::Config.config.inspect
+          yield ESI::Config.config
+          puts ESI::Config.config.inspect
+        end
+      end
+      nil
+    end
+  end
+
+  # create wrappers for request
+  class ESI::Request < Rack::Request
+    def params
+      env
+    end
+    def request_params
+      self.GET.update(self.POST)
+    end
+  end
+
+  # create wrappers for response
+  #class ESI::Response < Rack::Response
+  #  class Writer
+  #    def initialize( writer )
+  #      @writer = writer
+  #    end
+  #    def write(data)
+  #      @writer.write( data )
+  #    end
+  #  end
+  #  def socket
+  #    Writer.new(self)
+  #  end
+  #end
+
+  class RackAdapter
+    attr_reader :config
+    include ESI::Log
+
+    def initialize( config )
+      @config = config
+    end
+
+    def call(env)
+      start = Time.now
+      request = ESI::Request.new(env)
+      puts request.params["HTTP_VERSION"]
+
+      url = @config.router.url_for(request.params["REQUEST_URI"])
+
+      chunk_count = 0, bytes_sent = 0, status = 200, sent_from_cache = false
+      Rack::Response.new.finish do |response|
+        begin
+          chunk_count, bytes_sent, status, sent_from_cache = ESI::Proxy.new(@config).process(url, request, response)
+        rescue => e
+          log_error "\n#{e.message}: error at #{e.backtrace.first} msg at #{__FILE__}:#{__LINE__}\n"
+        ensure
+          log_request "\n#{url}, #{Time.now - start} seconds with status #{status} #{sent_from_cache ? "from cache" : ''} and #{chunk_count} chunks, #{bytes_sent} bytes\n"
+        end
+      end
+
+    end
+
+    def each
+    end
+
+  end
+end
+
+if $0 == __FILE__
+  require 'rubygems'
+  require 'ebb'
+  require 'yaml'
+  listeners = ESI::RackConfig.enable
+  eval( File.read(File.join(File.dirname(__FILE__),'..','..','samples','configs','config.rb')) )
+  Ebb.start_server(ESI::RackAdapter.new(ESI::Config.config), :port => 4444)
+end

data/lib/esi/response.rb

@@ -5,6 +5,35 @@ require 'thread'
 require 'stringio'
 
 module ESI
+  # this class allows me to write, <<, or call
+  # an object to send it bytes, priority being <<, then write, then call
+  class OutputAdapter
+    attr_reader :device
+    def initialize(output_device)
+      @device = output_device
+      if @device.respond_to?(:<<)
+        self.instance_eval do
+          def << (msg)
+            @device << msg
+          end
+        end
+      elsif @device.respond_to?(:write)
+        self.instance_eval do
+          def << (msg)
+            @device.write msg
+          end
+        end
+      elsif @device.respond_to?(:call)
+        self.instance_eval do
+          def << (msg)
+            @device.call msg
+          end
+        end
+      end
+    end
+
+  end
+
   class Response
     attr_reader :active_buffer
     attr_accessor :output
@@ -12,7 +41,7 @@ module ESI
     def initialize( output )
       @count = 0
       @back_buffer = []
-      @output = output
+      @output = OutputAdapter.new(output)
       @last_out = 0
       @threads = []
       @active_buffer = reserve_buffer

data/lib/esi/version.rb

@@ -2,7 +2,7 @@ module ESI #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/bench-plot.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+require 'gruff'
+
+trunkcsv = File.read(File.join(File.dirname(__FILE__),'benchmarks','csv-perf-trunk')).split("\n")
+serial04csv = File.read(File.join(File.dirname(__FILE__),'benchmarks','csv-perf-serial0.4')).split("\n")
+
+trunkcsv.shift
+serial04csv.shift
+
+g = Gruff::Line.new(1024)
+g.title = "trunk vs 0.4"
+g.font = "/usr/share/fonts/bitstream-vera/Vera.ttf" # my linux system's font 
+
+
+g.data("trunk",trunkcsv.collect {|pair| pair.split(",").last.to_f })
+
+g.data("serial 0.4",serial04csv.collect {|pair| pair.split(",").last.to_f })
+
+number_requests = 2000
+
+# need to compute the percentiles
+labels = { 1 => '1', 20 => '20', 40 => '40', 60 => '60', 80 => '80', 99 => '99' }
+
+#g.hide_dots = true
+g.labels = labels
+g.y_axis_label = "Time per request (ms)"
+g.x_axis_label = "Requests"
+g.theme_37signals
+
+puts "write: #{g.inspect}"
+g.write(File.join(File.dirname(__FILE__),'benchmarks','perf.png'))

data/test/benchmarks/csv-perf-serial0.4

@@ -0,0 +1,101 @@
+Percentage served,Time in ms
+0,5.000000e+00
+1,5.000000e+00
+2,5.000000e+00
+3,5.000000e+00
+4,5.000000e+00
+5,5.000000e+00
+6,5.000000e+00
+7,5.000000e+00
+8,5.000000e+00
+9,5.000000e+00
+10,5.000000e+00
+11,5.000000e+00
+12,5.000000e+00
+13,5.000000e+00
+14,5.000000e+00
+15,5.000000e+00
+16,5.000000e+00
+17,5.000000e+00
+18,5.000000e+00
+19,5.000000e+00
+20,5.000000e+00
+21,5.000000e+00
+22,5.000000e+00
+23,5.000000e+00
+24,5.000000e+00
+25,5.000000e+00
+26,5.000000e+00
+27,5.000000e+00
+28,5.000000e+00
+29,5.000000e+00
+30,5.000000e+00
+31,5.000000e+00
+32,5.000000e+00
+33,5.000000e+00
+34,5.000000e+00
+35,5.000000e+00
+36,5.000000e+00
+37,5.000000e+00
+38,5.000000e+00
+39,5.000000e+00
+40,5.000000e+00
+41,5.000000e+00
+42,5.000000e+00
+43,5.000000e+00
+44,5.000000e+00
+45,5.000000e+00
+46,5.000000e+00
+47,5.000000e+00
+48,5.000000e+00
+49,5.000000e+00
+50,5.000000e+00
+51,5.000000e+00
+52,5.000000e+00
+53,5.000000e+00
+54,5.000000e+00
+55,5.000000e+00
+56,5.000000e+00
+57,5.000000e+00
+58,5.000000e+00
+59,5.000000e+00
+60,5.000000e+00
+61,5.000000e+00
+62,5.000000e+00
+63,5.000000e+00
+64,5.000000e+00
+65,5.000000e+00
+66,5.000000e+00
+67,5.000000e+00
+68,5.000000e+00
+69,5.000000e+00
+70,5.000000e+00
+71,5.000000e+00
+72,5.000000e+00
+73,5.000000e+00
+74,5.000000e+00
+75,5.000000e+00
+76,5.000000e+00
+77,5.000000e+00
+78,5.000000e+00
+79,5.000000e+00
+80,5.000000e+00
+81,5.000000e+00
+82,5.000000e+00
+83,5.000000e+00
+84,5.000000e+00
+85,5.000000e+00
+86,5.000000e+00
+87,5.000000e+00
+88,5.000000e+00
+89,5.000000e+00
+90,5.000000e+00
+91,5.000000e+00
+92,5.000000e+00
+93,5.000000e+00
+94,5.000000e+00
+95,6.000000e+00
+96,2.800000e+01
+97,2.800000e+01
+98,3.700000e+01
+99,3.800000e+01