hayabusa 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,18 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.17)
+    datet (0.0.20)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
     http2 (0.0.10)
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.7.5)
-    knjrbfw (0.0.90)
+    knjrbfw (0.0.94)
       datet
       http2
       php4r
@@ -37,7 +37,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sqlite3 (1.3.6)
-    tpool (0.0.1)
+    tpool (0.0.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/hayabusa.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{hayabusa}
-  s.version = "0.0.9"
+  s.name = "hayabusa"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-29}
-  s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
-  s.email = %q{k@spernj.org}
+  s.date = "2012-09-11"
+  s.description = "A threadded web/app-server that focuses on threadding, shared ressources, speed and more."
+  s.email = "k@spernj.org"
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "knjappserver_start.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -106,11 +106,11 @@ Gem::Specification.new do |s|
     "tests/fcgi_test/vars_header_test.rhtml",
     "tests/fcgi_test/vars_post_test.rhtml"
   ]
-  s.homepage = %q{http://github.com/kaspernj/hayabusa}
+  s.homepage = "http://github.com/kaspernj/hayabusa"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "A threadded web/app-server that supports stand-alone, CGI and FCGI-modes."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/hayabusa.rb

@@ -400,13 +400,7 @@ class Hayabusa
       require @config[:autoload]
     end
     
-    begin
-      self.log_puts "Appserver startet." if @debug
-    rescue Interrupt => e
-      self.log_puts "Got interrupt - trying to stop appserver." if @debug
-      self.stop
-      raise e
-    end
+    self.log_puts "Appserver startet." if @debug
   end
   
   #Stops the entire app and releases join.
@@ -414,32 +408,21 @@ class Hayabusa
     return nil if @stop_called
     @stop_called = true
     
-    proc_stop = proc{
-      self.log_puts "Stopping appserver." if @debug
-      @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
-      
-      self.log_puts "Stopping threadpool." if @debug
-      @threadpool.stop if @threadpool
-      
-      #This should be done first to be sure it finishes (else we have a serious bug).
-      self.log_puts "Flush out loaded sessions." if @debug
-      
-      #Flush sessions and mails (only if the modules are loaded).
-      self.sessions_flush if self.respond_to?(:sessions_flush)
-      self.mail_flush if self.respond_to?(:mail_flush)
-      
-      self.log_puts "Stopping done..." if @debug
-    }
+    self.log_puts "Stopping appserver." if @debug
+    @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
     
-    #If we cant get a paused-execution in 5 secs - we just force the stop.
-    begin
-      Timeout.timeout(7) do
-        self.paused_exec(&proc_stop)
-      end
-    rescue Timeout::Error, SystemExit, Interrupt
-      self.log_puts "Forcing stop-appserver - couldnt get timing window." if @debug
-      proc_stop.call
-    end
+    self.log_puts "Stopping threadpool." if @debug
+    @threadpool.stop if @threadpool
+    
+    #This should be done first to be sure it finishes (else we have a serious bug).
+    self.log_puts "Flush out loaded sessions." if @debug
+    
+    #Flush sessions and mails (only if the modules are loaded).
+    self.flush_error_emails(:ignore_time => true) if self.respond_to?(:flush_error_emails)
+    self.sessions_flush if self.respond_to?(:sessions_flush)
+    self.mail_flush if self.respond_to?(:mail_flush)
+    
+    self.log_puts "Stopping done..." if @debug
   end
   
   #Stop running any more HTTP-requests - make them wait.
@@ -494,6 +477,7 @@ class Hayabusa
       @httpserv.thread_accept.join
       @httpserv.thread_restart.join if @httpserv and @httpserv.thread_restart
     rescue Interrupt => e
+      STDOUT.puts "Trying to stop because of interrupt - please wait while various data is beging flushed."
       self.stop
     end
     

data/lib/hayabusa_cgi_session.rb

@@ -1,6 +1,6 @@
 class Hayabusa::Cgi_session
   attr_accessor :data, :alert_sent
-  attr_reader :cookie, :get, :headers, :session, :session_id, :session_hash, :hb, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :working
+  attr_reader :cookie, :get, :headers, :ip, :session, :session_id, :session_hash, :hb, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :working
   
   def initialize(args)
     @args = args
@@ -77,7 +77,7 @@ class Hayabusa::Cgi_session
     end
     
     #Set the 'ip'-variable which is required for sessions.
-    @ip = @meta["REMOTE_ADDR"]
+    @ip = @hb.ip(:meta => @meta)
     raise "No 'ip'-variable was set: '#{@meta}'." if !@ip
     raise "'session_id' was not valid." if @session_id.to_s.strip.empty?
     

data/lib/hayabusa_cgi_tools.rb

@@ -1,6 +1,7 @@
 class Hayabusa::Cgi_tools
   attr_accessor :cgi
   
+  #Converts CGI-like-post hashes to the normal Hayabusa-type hash.
   def convert_fcgi_post(params)
     post_hash = {}
     
@@ -10,7 +11,7 @@ class Hayabusa::Cgi_tools
     
     post_ret = {}
     post_hash.each do |varname, value|
-      Knj::Web.parse_name(post_ret, varname, value, :urldecode => true)
+      Knj::Web.parse_name(post_ret, varname, value)
     end
     
     return post_ret

data/lib/hayabusa_ext/errors.rb

@@ -17,12 +17,12 @@ class Hayabusa
   end
   
   #Send error-emails based on error-emails-cache (cached so the same error isnt send out every time it occurrs to prevent spamming).
-  def flush_error_emails
+  def flush_error_emails(args = {})
     @error_emails_pending_mutex.synchronize do
       send_time_older_than = Time.new.to_i - @error_emails_time
       
       @error_emails_pending.each do |backtrace_hash, error_email|
-        if send_time_older_than < error_email[:last_time].to_i and error_email[:messages].length < 1000
+        if !args[:ignore_time] and send_time_older_than < error_email[:last_time].to_i and error_email[:messages].length < 1000
           next
         end
         

data/lib/hayabusa_ext/sessions.rb

@@ -35,12 +35,14 @@ class Hayabusa
   
   #Generates a new session-ID by the meta data.
   def session_generate_id(meta)
-    return Digest::MD5.hexdigest("#{Time.now.to_f}_#{meta["HTTP_HOST"]}_#{meta["REMOTE_HOST"]}_#{meta["HTTP_X_FORWARDED_SERVER"]}_#{meta["HTTP_X_FORWARDED_FOR"]}_#{meta["HTTP_X_FORWARDED_HOST"]}_#{meta["REMOTE_ADDR"]}_#{meta["HTTP_USER_AGENT"]}")
+    return Digest::MD5.hexdigest("#{Time.now.to_f}_#{meta["HTTP_HOST"]}_#{self.ip(:meta => meta)}_#{meta["HTTP_USER_AGENT"]}")
   end
   
   #Will make the session rememberable for a year. IP wont be checked any more.
   def session_remember
-    session = _httpsession.session
+    httpsession = Thread.current[:hayabusa][:httpsession]
+    raise "Could not figure out HTTP-session." if !httpsession
+    session = httpsession.session
     raise "Could not get session-variable from HTTP-session." if !session
     session[:remember] = 1
     
@@ -52,6 +54,21 @@ class Hayabusa
     )
   end
   
+  #Will make the session run out as soon as the user closes his browser.
+  def session_dont_remember
+    httpsession = Thread.current[:hayabusa][:httpsession]
+    raise "Could not figure out HTTP-session." if !httpsession
+    session = httpsession.session
+    raise "Could not get session-variable from HTTP-session." if !session
+    session[:remember] = 0
+    
+    self.cookie(
+      "name" => "HayabusaSession",
+      "value" => _httpsession.session_id,
+      "path" => "/"
+    )
+  end
+  
   #Writes all session-data to the database (normally it is cached in memory and not updated on change).
   def sessions_flush
     if @sessions

data/lib/hayabusa_ext/threadding.rb

@@ -11,7 +11,7 @@ class Hayabusa
   end
   
   #Callback for when an error occurs in the threadpool.
-  def threadpool_on_error(event, error)
+  def threadpool_on_error(error)
     self.handle_error(error)
   end
   

data/lib/hayabusa_ext/web.rb

@@ -187,4 +187,23 @@ class Hayabusa
     raise "Http-server not spawned yet. Call Hayabusa#start to spawn it." if !@httpserv
     return @httpserv.server.addr[1]
   end
+  
+  #Returns the real IP of the client. Even if it has been proxied through multiple proxies.
+  def ip(args = nil)
+    if args and args[:meta]
+      meta = args[:meta]
+    elsif httpsession = Thread.current[:hayabusa][:httpsession]
+      meta = httpsession.meta
+    else
+      raise "Could not figure out meta-data."
+    end
+    
+    if !meta["HTTP_X_FORWARDED_FOR"].to_s.strip.empty? and ips = meta["HTTP_X_FORWARDED_FOR"].split(/\s*,\s*/)
+      return ips.first.to_s.strip
+    elsif ip = meta["REMOTE_ADDR"].to_s.strip and !ip.empty?
+      return ip
+    else
+      raise "Could not figure out IP from meta-data."
+    end
+  end
 end

data/lib/hayabusa_fcgi.rb

@@ -31,8 +31,7 @@ class Hayabusa::Fcgi
     hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
     hayabusa_conf.merge!(
       :cmdline => false,
-      :mailing_timeout => 1,
-      :mailing_instant => true,
+      :mailing_timeout => 1, #Since FCGI might terminate at any time, try to send out mails almost instantly in the background.
       :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
     )
     
@@ -116,15 +115,14 @@ class Hayabusa::Fcgi
           if @fcgi_proxy
             #Proxy request to the host-FCGI-process.
             $stderr.puts "[hayabusa] Proxying request." if @debug
-            begin
-              @cgi_tools.proxy_request_to(:cgi => cgi, :http => @fcgi_proxy[:http], :fp_log => @fcgi_proxy[:fp_log])
-            rescue Errno::ECONNABORTED
-              @fcgi_proxy = nil #Force re-evaluate if this process should be host or proxy.
-              raise
-            end
+            @cgi_tools.proxy_request_to(:cgi => cgi, :http => @fcgi_proxy[:http], :fp_log => @fcgi_proxy[:fp_log])
           else
             self.handle_fcgi_request(:cgi => cgi)
           end
+        rescue Errno::ECONNABORTED
+          $stderr.puts "[hayabusa] Connection to server was interrupted - trying again."
+          @fcgi_proxy = nil #Force re-evaluate if this process should be host or proxy.
+          retry
         rescue Exception => e
           cgi.print "Content-Type: text/html\r\n"
           cgi.print "\r\n"

data/lib/hayabusa_http_session.rb

@@ -1,7 +1,7 @@
 #This class handels the HTTP-sessions.
 class Hayabusa::Http_session
   attr_accessor :data, :alert_sent
-  attr_reader :cookie, :get, :headers, :session, :session_id, :session_hash, :hb, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
+  attr_reader :cookie, :get, :headers, :ip, :session, :session_id, :session_hash, :hb, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
   
   #Autoloader for subclasses.
   def self.const_missing(name)
@@ -237,14 +237,7 @@ class Hayabusa::Http_session
     @resp.header("Content-Type", @ctype)
     
     @browser = Knj::Web.browser(@meta)
-    
-    if @meta["HTTP_X_FORWARDED_FOR"]
-      @ip = @meta["HTTP_X_FORWARDED_FOR"].split(",")[0].strip
-    elsif @meta["REMOTE_ADDR"]
-      @ip = @meta["REMOTE_ADDR"]
-    else
-      raise "Could not figure out the IP of the session."
-    end
+    @ip = @hb.ip(:meta => @meta)
     
     @hb.log_puts "Figuring out session-ID, session-object and more." if @debug
     if @cookie["HayabusaSession"].to_s.length > 0

data/lib/models/log.rb

@@ -99,7 +99,7 @@ class Hayabusa::Models::Log < Knj::Datarow
   def ip
     meta_d = self.meta
     
-    return meta_d[:HTTP_X_FORWARDED_FOR] if meta_d.has_key?(:HTTP_X_FORWARDED_FOR)
+    return meta_d[:HTTP_X_FORWARDED_FOR].split(/\s*,\s*/).first if meta_d.has_key?(:HTTP_X_FORWARDED_FOR)
     return meta_d[:REMOTE_ADDR] if meta_d.has_key?(:REMOTE_ADDR)
     return "[no ip logged]"
   end

data/spec/cgi_spec.rb

@@ -8,6 +8,7 @@ describe "Hayabusa" do
     
     Http2.new(:host => "localhost") do |http|
       res = http.post(:url => "hayabusa_cgi_test/vars_post_test.rhtml", :post => {
+        "test_special_chars" => "1%23+-456",
         "var" => {
           0 => 1,
           1 => 2,
@@ -30,6 +31,7 @@ describe "Hayabusa" do
         raise "Error when parsing result: '#{data}'."
       end
       
+      raise "Expected 'test_special_chars' to be '1%23+-456' but it wasnt: '#{data["test_special_chars"]}'." if data["test_special_chars"] != "1%23+-456"
       
       res = http.get("hayabusa_cgi_test/threadded_content_test.rhtml")
       raise "Expected body to be '123456' but it was: '#{res.body}'." if res.body != "123456"

data/spec/fcgi_spec.rb

@@ -15,6 +15,7 @@ describe "Hayabusa" do
         begin
           Http2.new(:host => "localhost") do |http|
             res = http.post(:url => "hayabusa_fcgi_test/vars_post_test.rhtml", :post => {
+              "test_special_chars" => "1%23+-456",
               "var" => {
                 0 => 1,
                 1 => 2,
@@ -37,6 +38,7 @@ describe "Hayabusa" do
               raise "Error when parsing result: '#{data}'."
             end
             
+            raise "Expected 'test_special_chars' to be '1%23+-456' but it wasnt: '#{data["test_special_chars"]}'." if data["test_special_chars"] != "1%23+-456"
             
             res = http.get("hayabusa_fcgi_test/threadded_content_test.rhtml")
             raise "Expected body to be '123456' but it was: '#{res.body}'." if res.body != "123456"

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 +02:00
-default_executable: 
+date: 2012-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: knjrbfw
@@ -236,7 +235,6 @@ files:
 - tests/fcgi_test/vars_get_test.rhtml
 - tests/fcgi_test/vars_header_test.rhtml
 - tests/fcgi_test/vars_post_test.rhtml
-has_rdoc: true
 homepage: http://github.com/kaspernj/hayabusa
 licenses: 
 - MIT
@@ -250,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4101097160978567586
+      hash: 3667106797343681147
       segments: 
       - 0
       version: "0"
@@ -263,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.