hayabusa 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hayabusa}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-19}
+  s.date = %q{2012-08-22}
   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"]

data/lib/hayabusa.rb

@@ -34,7 +34,8 @@ class Hayabusa
       :default_filetype => "text/html",
       :max_requests_working => 20,
       :size_send => 1024,
-      :cleaner_timeout => 300
+      :cleaner_timeout => 300,
+      :mailing_time => 30
     }.merge(config)
     
     @config[:smtp_args] = {"smtp_host" => "localhost", "smtp_port" => 25} if !@config[:smtp_args]
@@ -422,14 +423,17 @@ class Hayabusa
       
       #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
-      self.sessions_flush
+      
+      #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
     }
     
     #If we cant get a paused-execution in 5 secs - we just force the stop.
     begin
-      Timeout.timeout(5) do
+      Timeout.timeout(7) do
         self.paused_exec(&proc_stop)
       end
     rescue Timeout::Error, SystemExit, Interrupt

data/lib/hayabusa_ext/mailing.rb

@@ -5,12 +5,11 @@ class Hayabusa
   
   def initialize_mailing
     require "knj/autoload/ping"
-    require "monitor"
     
     @mails_waiting = []
     @mails_mutex = Monitor.new
     @mails_queue_mutex = Monitor.new
-    @mails_timeout = self.timeout(:time => 30, &self.method(:mail_flush))
+    @mails_timeout = self.timeout(:time => @config[:mailing_time], &self.method(:mail_flush))
   end
   
   #Queue a mail for sending. Possible keys are: :subject, :from, :to, :text and :html.
@@ -31,7 +30,13 @@ class Hayabusa
       mailobj = Hayabusa::Mail.new({:hb => self, :errors => {}, :status => :waiting}.merge(mail_args))
       STDOUT.print "Added mail '#{mailobj.__id__}' to the mail-send-queue.\n" if debug
       @mails_waiting << mailobj
-      self.mail_flush if mail_args[:now]
+      
+      #Try to send right away and raise error instantly if something happens if told to do so.
+      if mail_args[:now] or @config[:mailing_instant]
+        self.mail_flush
+        raise mailobj.args[:error] if mailobj.args[:error]
+      end
+      
       return mailobj
     end
   end
@@ -53,11 +58,9 @@ class Hayabusa
         return false  #Dont run if we dont have a connection to the internet and then properly dont have a connection to the SMTP as well.
       end
       
-      begin
-        #Use subprocessing to avoid the mail-framework (activesupport and so on, also possible memory leaks in those large frameworks).
-        STDOUT.print "Starting subprocess for mailing.\n" if @debug
-        require "knj/process_meta"
-        subproc = Knj::Process_meta.new("debug" => @debug, "debug_err" => true, "id" => "hayabusa_mailing")
+      #Use subprocessing to avoid the mail-framework (activesupport and so on, also possible memory leaks in those large frameworks).
+      STDOUT.print "Starting subprocess for mailing.\n" if @debug
+      Knj::Process_meta.new("debug" => @debug, "debug_err" => true, "id" => "hayabusa_mailing") do |subproc|
         subproc.static("Object", "require", "rubygems")
         subproc.static("Object", "require", "mail")
         subproc.static("Object", "require", "#{@config[:knjrbfw_path]}knjrbfw")
@@ -80,9 +83,6 @@ class Hayabusa
           
           sleep 1 #sleep so we dont take up too much bandwidth.
         end
-      ensure
-        subproc.destroy if subproc
-        subproc = nil
       end
       
       return nil
@@ -91,12 +91,23 @@ class Hayabusa
   
   #This class represents the queued mails.
   class Mail
+    attr_reader :args
+    
     def initialize(args)
       @args = args
       
       raise "No hayabusa-object was given (as :hb)." if !@args[:hb].is_a?(Hayabusa)
       raise "No :to was given." if !@args[:to]
       raise "No content was given (:html or :text)." if !@args[:html] and !@args[:text]
+      
+      #Test from-argument.
+      if !@args[:from].to_s.strip.empty?
+        #Its ok.
+      elsif !@args[:hb].config[:error_report_from].to_s.strip.empty?
+        @args[:from] = @args[:hb].config[:error_report_from]
+      else
+        raise "Dont know where to take the 'from'-paramter from - none given in appserver config or mail-method-arguments?"
+      end
     end
     
     #Returns a key from the arguments.
@@ -108,14 +119,6 @@ class Hayabusa
     def send(args = {})
       STDOUT.print "Sending mail '#{__id__}'.\n" if @args[:hb].debug
       
-      if @args[:from]
-        from = @args[:from]
-      elsif @args[:hb].config[:error_report_from]
-        from = @args[:hb].config[:error_report_from]
-      else
-        raise "Dont know where to take the 'from'-paramter from - none given in appserver config or mail-method-arguments?"
-      end
-      
       if args["proc"]
         args["proc"].static("Object", "require", "knj/mailobj")
         mail = args["proc"].new("Knj::Mailobj", @args[:hb].config[:smtp_args])
@@ -123,16 +126,15 @@ class Hayabusa
         mail._pm_send_noret("subject=", @args[:subject]) if @args[:subject]
         mail._pm_send_noret("html=", Knj::Strings.email_str_safe(@args[:html])) if @args[:html]
         mail._pm_send_noret("text=", Knj::Strings.email_str_safe(@args[:text])) if @args[:text]
-        mail._pm_send_noret("from=", from)
+        mail._pm_send_noret("from=", @args[:from])
         mail._pm_send_noret("send")
       else
-        require "knj/mailobj"
         mail = Knj::Mailobj.new(@args[:hb].config[:smtp_args])
         mail.to = @args[:to]
         mail.subject = @args[:subject] if @args[:subject]
         mail.html = Knj::Strings.email_str_safe(@args[:html]) if @args[:html]
         mail.text = Knj::Strings.email_str_safe(@args[:text]) if @args[:text]
-        mail.from = from
+        mail.from = @args[:from]
         mail.send
       end
       

data/lib/hayabusa_fcgi.rb

@@ -31,6 +31,8 @@ class Hayabusa::Fcgi
     hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
     hayabusa_conf.merge!(
       :cmdline => false,
+      :mailing_timeout => 1,
+      :mailing_instant => true,
       :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
     )
     
@@ -84,49 +86,54 @@ class Hayabusa::Fcgi
   
   def fcgi_loop
     $stderr.puts "[hayabusa] Starting FCGI." if @debug
-    FCGI.each_cgi do |cgi|
-      begin
-        #cgi.print "Content-Type: text/html\r\n"
-        #cgi.print "\r\n"
-        
-        #Set 'cgi'-variable for CGI-tools.
-        @cgi_tools.cgi = cgi
-        @cgi = cgi
-        
-        #Evaluate the mode of this instance.
-        self.evaluate_mode
-        
-        #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"]
-        
-        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
+    
+    begin
+      FCGI.each_cgi do |cgi|
+        begin
+          #cgi.print "Content-Type: text/html\r\n"
+          #cgi.print "\r\n"
+          
+          #Set 'cgi'-variable for CGI-tools.
+          @cgi_tools.cgi = cgi
+          @cgi = cgi
+          
+          #Evaluate the mode of this instance.
+          self.evaluate_mode
+          
+          #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"]
+          
+          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
+          else
+            self.handle_fcgi_request(:cgi => cgi)
           end
-        else
-          self.handle_fcgi_request(:cgi => cgi)
-        end
-      rescue Exception => e
-        cgi.print "Content-Type: text/html\r\n"
-        cgi.print "\r\n"
-        cgi.print Knj::Errors.error_str(e, :html => true)
-        
-        if @hayabusa
-          @hayabusa.log_puts e.inspect
-          @hayabusa.log_puts e.backtrace
-        else
-          STDERR.puts e.inspect
-          STDERR.puts e.backtrace
+        rescue Exception => e
+          cgi.print "Content-Type: text/html\r\n"
+          cgi.print "\r\n"
+          cgi.print Knj::Errors.error_str(e, :html => true)
+          
+          if @hayabusa
+            @hayabusa.log_puts e.inspect
+            @hayabusa.log_puts e.backtrace
+          else
+            STDERR.puts e.inspect
+            STDERR.puts e.backtrace
+          end
+        ensure
+          @cgi = nil
+          @cgi_tools.cgi = nil
         end
-      ensure
-        @cgi = nil
-        @cgi_tools.cgi = nil
       end
+    ensure
+      @hayabusa.stop if @hayabusa
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-19 00:00:00 +02:00
+date: 2012-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4467639254146667780
+      hash: -1836290877562781605
       segments: 
       - 0
       version: "0"