hayabusa 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.15)
+    datet (0.0.17)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
@@ -12,7 +12,7 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.7.5)
-    knjrbfw (0.0.87)
+    knjrbfw (0.0.90)
       datet
       http2
       php4r

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/hayabusa_fcgi.fcgi

@@ -3,9 +3,6 @@
 #This scripts start an appserver, executes a CGI-request for every FCGI-request and terminates when FCGI terminates.
 #Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
 
-debug = false
-
-$stderr.puts "[hayabusa] Starting up!" if debug
 error_log_file = "/tmp/hayabusa_fcgi.log"
 
 begin
@@ -15,17 +12,25 @@ rescue Errno::ENOENT
 end
 
 begin
-  $stderr.puts "[hayabusa] Loading libs." if debug
   require "rubygems"
-  require "knjrbfw"
   require "fcgi"
   require "fileutils"
-  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   
+  #Try to load development-version to enable debugging without doing constant gem-installations.
+  path = "/home/kaspernj/Ruby/knjrbfw/lib/knjrbfw.rb"
+  if File.exists?(path)
+    require path
+  else
+    require "knjrbfw"
+  end
+  
+  #Load 'Hayabusa' and start the FCGI-loop to begin handeling requests.
+  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   fcgi = Hayabusa::Fcgi.new
   fcgi.fcgi_loop
 rescue Exception => e
   if !e.is_a?(Interrupt)
+    #Log error to the log-file if something happened.
     File.open(error_log_file, "w") do |fp|
       fp.puts e.inspect
       fp.puts e.backtrace
@@ -33,5 +38,6 @@ rescue Exception => e
     end
   end
   
+  #Just raise it normally as if a normal error occurred.
   raise e
 end

data/bin/hayabusa_fcgi.rb

@@ -3,9 +3,6 @@
 #This scripts start an appserver, executes a CGI-request for every FCGI-request and terminates when FCGI terminates.
 #Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
 
-debug = false
-
-$stderr.puts "[hayabusa] Starting up!" if debug
 error_log_file = "/tmp/hayabusa_fcgi.log"
 
 begin
@@ -15,17 +12,25 @@ rescue Errno::ENOENT
 end
 
 begin
-  $stderr.puts "[hayabusa] Loading libs." if debug
   require "rubygems"
-  require "knjrbfw"
   require "fcgi"
   require "fileutils"
-  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   
+  #Try to load development-version to enable debugging without doing constant gem-installations.
+  path = "/home/kaspernj/Ruby/knjrbfw/lib/knjrbfw.rb"
+  if File.exists?(path)
+    require path
+  else
+    require "knjrbfw"
+  end
+  
+  #Load 'Hayabusa' and start the FCGI-loop to begin handeling requests.
+  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   fcgi = Hayabusa::Fcgi.new
   fcgi.fcgi_loop
 rescue Exception => e
   if !e.is_a?(Interrupt)
+    #Log error to the log-file if something happened.
     File.open(error_log_file, "w") do |fp|
       fp.puts e.inspect
       fp.puts e.backtrace
@@ -33,5 +38,6 @@ rescue Exception => e
     end
   end
   
+  #Just raise it normally as if a normal error occurred.
   raise e
 end

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hayabusa}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-22}
+  s.date = %q{2012-08-24}
   s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "knjappserver_start.rb"]
@@ -99,6 +99,7 @@ Gem::Specification.new do |s|
     "tests/cgi_test/vars_post_test.rhtml",
     "tests/fcgi_test/config_fcgi.rb",
     "tests/fcgi_test/index.rhtml",
+    "tests/fcgi_test/multiple_threads.rhtml",
     "tests/fcgi_test/sleeper.rhtml",
     "tests/fcgi_test/threadded_content_test.rhtml",
     "tests/fcgi_test/vars_get_test.rhtml",

data/lib/hayabusa_cgi_session.rb

@@ -57,7 +57,7 @@ class Hayabusa::Cgi_session
     @ext = File.extname(@page_path).downcase[1..-1].to_s
     
     @resp = Hayabusa::Http_session::Response.new(:socket => self)
-    @resp.reset(:http_version => http_version, :mode => :cgi)
+    @resp.reset(:http_version => http_version, :mode => :cgi, :cookie => @cookie)
     
     @cgroup = Hayabusa::Http_session::Contentgroup.new(:socket => self, :hb => @hb, :resp => @resp, :httpsession => self)
     @cgroup.reset
@@ -67,7 +67,7 @@ class Hayabusa::Cgi_session
     
     
     #Set up session-variables.
-    if @cookie["HayabusaSession"].to_s.length > 0
+    if !@cookie["HayabusaSession"].to_s.empty?
       @session_id = @cookie["HayabusaSession"]
     elsif @browser["browser"] == "bot"
       @session_id = "bot"
@@ -76,6 +76,11 @@ class Hayabusa::Cgi_session
       send_cookie = true
     end
     
+    #Set the 'ip'-variable which is required for sessions.
+    @ip = @meta["REMOTE_ADDR"]
+    raise "No 'ip'-variable was set: '#{@meta}'." if !@ip
+    raise "'session_id' was not valid." if @session_id.to_s.strip.empty?
+    
     begin
       @session, @session_hash = @hb.session_fromid(@ip, @session_id, @meta)
     rescue ArgumentError => e

data/lib/hayabusa_ext/sessions.rb

@@ -8,7 +8,7 @@ class Hayabusa
     ip = "bot" if idhash == "bot"
     
     if !@sessions.key?(idhash)
-      session = @ob.get_by(:Session, {"idhash" => idhash})
+      session = @ob.get_by(:Session, "idhash" => idhash)
       if !session
         session = @ob.add(:Session, {
           :idhash => idhash,
@@ -27,9 +27,7 @@ class Hayabusa
       hash = @sessions[idhash][:hash]
     end
     
-    if ip != "bot" and !session.remember? and ip.to_s != session[:ip].to_s
-      raise ArgumentError, "Invalid IP."
-    end
+    raise ArgumentError, "Invalid IP." if ip != "bot" and !session.remember? and ip.to_s != session[:ip].to_s
     
     @sessions[idhash][:time_lastused] = Time.now
     return [session, hash]

data/lib/hayabusa_fcgi.rb

@@ -53,8 +53,14 @@ class Hayabusa::Fcgi
           #Set this instance to run in proxy-mode.
           begin
             @fcgi_proxy = fcgi_config
-            require "http2"
-            @fcgi_proxy[:http] = Http2.new(:host => "localhost", :port => @fcgi_proxy[:port].to_i)
+            Knj.gem_require(:Http2, "http2")
+            
+            begin
+              @fcgi_proxy[:http] = Http2.new(:host => "localhost", :port => @fcgi_proxy[:port].to_i)
+            rescue Errno::ECONNREFUSED
+              #The host-process has properly closed - evaluate mode again.
+              raise Errno::EAGAIN
+            end
             
             if hayabusa_conf[:debug]
               @fcgi_proxy[:fp_log] = File.open("/tmp/hayabusa_#{hayabusa_conf[:hayabusa][:title]}_#{Process.pid}.log", "w")
@@ -98,7 +104,11 @@ class Hayabusa::Fcgi
           @cgi = cgi
           
           #Evaluate the mode of this instance.
-          self.evaluate_mode
+          begin
+            self.evaluate_mode
+          rescue Errno::EAGAIN
+            retry
+          end
           
           #Ensure the same FCGI-process isnt active for more than one website.
           raise "Expected 'HTTP_HAYABUSA_FCGI_CONFIG' to be '#{@hayabusa_fcgi_conf_path}' but it wasnt: '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if @hayabusa_fcgi_conf_path and @hayabusa_fcgi_conf_path != cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]

data/lib/hayabusa_http_session.rb

@@ -218,7 +218,8 @@ class Hayabusa::Http_session
     close = true if @meta["HTTP_CONNECTION"] == "close"
     @resp.reset(
       :http_version => @handler.http_version,
-      :close => close
+      :close => close,
+      :cookie => @cookie
     )
     if @handler.http_version == "1.1"
       @cgroup.chunked = true

data/lib/hayabusa_http_session_response.rb

@@ -38,6 +38,7 @@ class Hayabusa::Http_session::Response
     @close = true if @http_version == "1.0"
     @trailers = []
     @skip_statuscode = true if args[:mode] == :cgi
+    @session_cookie = args[:cookie]
     
     @headers_sent = false
     @headers_trailing = {}
@@ -77,6 +78,7 @@ class Hayabusa::Http_session::Response
   
   def cookie(cookie)
     @cookies << cookie
+    @session_cookie[cookie["name"]] = cookie["value"]
   end
   
   def header_str

data/spec/fcgi_multiple_processes_spec.rb

@@ -1,9 +1,81 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Hayabusa" do
+  it "should handle sessions correctly under stressed conditions" do
+    require "knjrbfw"
+    Knj.gem_require(:Http2, "http2")
+    require "json"
+    
+    ts = []
+    errs = []
+    
+    1.upto(10) do |t_i|
+      ts << Thread.new do
+        if t_i == 1
+          debug = true
+        else
+          debug = false
+        end
+        
+        begin
+          session_id = nil
+          hayabusa_session_id = nil
+          session_hash_obj_id = nil
+          
+          Http2.new(:host => "localhost", :user_agent => "Client#{t_i}", :debug => false) do |http|
+            1.upto(25) do |request_i|
+              res = http.get(:url => "hayabusa_fcgi_test/multiple_threads.rhtml")
+              
+              begin
+                data_json = JSON.parse(res.body)
+              rescue => e
+                raise "Could not parse result as JSON: '#{res.body}'."
+              end
+              
+              data = {}
+              data_json.each do |key, val|
+                data["#{key.to_s}"] = "#{val.to_s}"
+              end
+              
+              if request_i == 1
+                hayabusa_session_id = data["cookie"]["HayabusaSession"]
+                session_hash_obj_id = data["session_hash_id"]
+                session_id = data["session_id"]
+              end
+              
+              #puts "request-i: #{request_i}, data-request-count: #{data["request_count"]}, hash-id: #{data["session_hash_id"]}" if debug
+              
+              #Check 'HayabusaSession'-cookie.
+              raise "No 'HayabusaSession'-cookie?" if !data["cookie"]["HayabusaSession"]
+              raise "Expected 'HayabusaSession'-cookie to be '#{hayabusa_session_id}' but it wasnt: '#{data["cookie"]["HayabusaSession"]}' (#{data["cookie"]})." if hayabusa_session_id != data["cookie"]["HayabusaSession"]
+              
+              #Check session-hash-object-ID.
+              raise "No 'session_hash_id' from request: '#{data}'." if data["session_hash_id"].to_s.strip.empty?
+              raise "Expected session-hash-object-ID to be '#{session_hash_obj_id}' but it wasnt: '#{data["session_hash_id"]}'." if session_hash_obj_id != data["session_hash_id"] or !session_hash_obj_id
+              
+              
+              #Check session-object-ID.
+              raise "Expected session-ID to be '#{session_id}' but it wasnt: '#{data["session_id"]}' for request '#{request_i}'." if session_id != data["session_id"]
+              raise "Expected request-count for session to be the same as on the client: '#{request_i}' but it wasnt: '#{data["request_count"]}'." if data["request_count"].to_i != request_i
+            end
+          end
+        rescue => e
+          errs << e
+        end
+      end
+    end
+    
+    ts.each do |t|
+      t.join
+    end
+    
+    errs.each do |e|
+      raise e
+    end
+  end
+  
   it "two simultanious request should be handeled by the same process - one should proxy the request" do
-    require "rubygems"
-    require "http2"
+    Knj.gem_require(:Http2, "http2")
     require "json"
     
     Http2.new(:host => "localhost") do |http1|

data/tests/fcgi_test/multiple_threads.rhtml

@@ -0,0 +1,18 @@
+<%
+  require "json"
+  
+  if !_session.key?(:request_count)
+    _session[:request_count] = 1
+  else
+    _session[:request_count] = _session[:request_count].to_i + 1
+  end
+  
+  print JSON.generate(
+    :pid => Process.pid,
+    :session_id => _session_obj.id,
+    :session_hash_id => _session.__id__,
+    :request_count => _session[:request_count],
+    :cookie => _cookie,
+    :meta => _meta
+  )
+%>

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-22 00:00:00 +02:00
+date: 2012-08-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,6 +230,7 @@ files:
 - tests/cgi_test/vars_post_test.rhtml
 - tests/fcgi_test/config_fcgi.rb
 - tests/fcgi_test/index.rhtml
+- tests/fcgi_test/multiple_threads.rhtml
 - tests/fcgi_test/sleeper.rhtml
 - tests/fcgi_test/threadded_content_test.rhtml
 - tests/fcgi_test/vars_get_test.rhtml
@@ -249,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1836290877562781605
+      hash: 1153147131949596081
       segments: 
       - 0
       version: "0"