hayabusa 0.0.3 → 0.0.4

data/Gemfile

@@ -8,6 +8,7 @@ gem "erubis"
 gem "mail"
 gem "datet"
 gem "http2"
+gem "tpool"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -11,8 +11,8 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.7.4)
-    knjrbfw (0.0.85)
+    json (1.7.5)
+    knjrbfw (0.0.87)
       datet
       http2
       php4r
@@ -23,7 +23,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    php4r (0.0.2)
+    php4r (0.0.3)
       datet
       http2
     polyglot (0.3.3)
@@ -37,6 +37,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sqlite3 (1.3.6)
+    tpool (0.0.1)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -57,3 +58,4 @@ DEPENDENCIES
   mail
   rspec (~> 2.3.0)
   sqlite3
+  tpool

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/hayabusa_fcgi.fcgi

@@ -22,135 +22,8 @@ begin
   require "fileutils"
   require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   
-  #Spawn CGI-variable to emulate FCGI part.
-  cgi_tools = Hayabusa::Cgi_tools.new
-  
-  #We cant define the Hayabusa-server untuil we receive the first headers, so wait for the first request.
-  hayabusa = nil
-  hayabusa_fcgi_conf_path = nil
-  fcgi_proxy = nil
-  
-  $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
-      
-      #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 !hayabusa
-        raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given." if !cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        hayabusa_fcgi_conf_path = cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        require hayabusa_fcgi_conf_path
-        raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if !Hayabusa.const_defined?(:FCGI_CONF)
-        conf = Hayabusa::FCGI_CONF
-        
-        hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
-        hayabusa_conf.merge!(
-          :cmdline => false,
-          :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
-        )
-        
-        #Figure out if this should be a host-FCGI-process or a proxy-FCGI-process.
-        fcgi_config_fp = "#{Knj::Os.tmpdir}/hayabusa_fcgi_#{hayabusa_conf[:title]}_fcgi.conf"
-        FileUtils.touch(fcgi_config_fp) if !File.exists?(fcgi_config_fp)
-        
-        begin
-          File.open(fcgi_config_fp) do |fp|
-            fp.flock(File::LOCK_EX)
-            
-            fcgi_config_cont = File.read(fcgi_config_fp)
-            
-            if !fcgi_config_cont.empty?
-              fcgi_config = Marshal.load(File.read(fcgi_config_fp))
-              pid = fcgi_config[:pid]
-              
-              if Knj::Unix_proc.pid_running?(pid)
-                fcgi_proxy = fcgi_config
-                
-                require "http2"
-                http = Http2.new(:host => "localhost", :port => fcgi_proxy[:port].to_i)
-                fcgi_proxy[:http] = http
-              end
-            else
-              fcgi_config = nil
-            end
-            
-            if !fcgi_proxy
-              File.open(fcgi_config_fp, "w") do |fp|
-                hayabusa = Hayabusa.new(hayabusa_conf)
-                
-                #Start web-server for proxy-requests.
-                hayabusa.start
-                
-                fp.write(Marshal.dump(
-                  :pid => Process.pid,
-                  :port => hayabusa.port
-                ))
-              end
-            end
-          end
-        ensure
-          File.open(fcgi_config_fp).flock(File::LOCK_UN)
-        end
-      end
-      
-      
-      
-      if fcgi_proxy
-        #Proxy request to the host-FCGI-process.
-        $stderr.puts "[hayabusa] Proxying request." if debug
-        cgi_tools.proxy_request_to(:cgi => cgi, :http => fcgi_proxy[:http])
-      else
-        #Host the FCGI-process.
-        $stderr.puts "[hayabusa] Running request as CGI." if debug
-        
-        #Enforce $stdout variable.
-        $stdout = hayabusa.cio
-        
-        #The rest is copied from the FCGI-part.
-        headers = {}
-        cgi.env_table.each do |key, val|
-          if key[0, 5] == "HTTP_" and key != "HTTP_HAYABUSA_FCGI_CONFIG"
-            key = key[5, key.length].gsub("_", " ").gsub(" ", "-")
-            headers[key] = val
-          end
-        end
-        
-        meta = cgi.env_table.to_hash
-        
-        uri = Knj::Web.parse_uri(meta["REQUEST_URI"])
-        meta["PATH_TRANSLATED"] = File.basename(uri[:path])
-        
-        cgi_data = {
-          :cgi => cgi,
-          :headers => headers,
-          :get => Knj::Web.parse_urlquery(cgi.env_table["QUERY_STRING"], :urldecode => true, :force_utf8 => true),
-          :meta => meta
-        }
-        if cgi.request_method == "POST"
-          cgi_data[:post] = cgi_tools.convert_fcgi_post(cgi.params)
-        else
-          cgi_data[:post] = {}
-        end
-        
-        hayabusa.config[:cgi] = cgi_data
-        
-        
-        #Handle request.
-        hayabusa.start_cgi_request
-      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)
-      cgi.print Knj.p(cgi_data, true) if cgi_data
-    end
-  end
+  fcgi = Hayabusa::Fcgi.new
+  fcgi.fcgi_loop
 rescue Exception => e
   if !e.is_a?(Interrupt)
     File.open(error_log_file, "w") do |fp|

data/bin/hayabusa_fcgi.rb

@@ -22,135 +22,8 @@ begin
   require "fileutils"
   require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
   
-  #Spawn CGI-variable to emulate FCGI part.
-  cgi_tools = Hayabusa::Cgi_tools.new
-  
-  #We cant define the Hayabusa-server untuil we receive the first headers, so wait for the first request.
-  hayabusa = nil
-  hayabusa_fcgi_conf_path = nil
-  fcgi_proxy = nil
-  
-  $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
-      
-      #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 !hayabusa
-        raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given." if !cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        hayabusa_fcgi_conf_path = cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        require hayabusa_fcgi_conf_path
-        raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if !Hayabusa.const_defined?(:FCGI_CONF)
-        conf = Hayabusa::FCGI_CONF
-        
-        hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
-        hayabusa_conf.merge!(
-          :cmdline => false,
-          :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
-        )
-        
-        #Figure out if this should be a host-FCGI-process or a proxy-FCGI-process.
-        fcgi_config_fp = "#{Knj::Os.tmpdir}/hayabusa_fcgi_#{hayabusa_conf[:title]}_fcgi.conf"
-        FileUtils.touch(fcgi_config_fp) if !File.exists?(fcgi_config_fp)
-        
-        begin
-          File.open(fcgi_config_fp) do |fp|
-            fp.flock(File::LOCK_EX)
-            
-            fcgi_config_cont = File.read(fcgi_config_fp)
-            
-            if !fcgi_config_cont.empty?
-              fcgi_config = Marshal.load(File.read(fcgi_config_fp))
-              pid = fcgi_config[:pid]
-              
-              if Knj::Unix_proc.pid_running?(pid)
-                fcgi_proxy = fcgi_config
-                
-                require "http2"
-                http = Http2.new(:host => "localhost", :port => fcgi_proxy[:port].to_i)
-                fcgi_proxy[:http] = http
-              end
-            else
-              fcgi_config = nil
-            end
-            
-            if !fcgi_proxy
-              File.open(fcgi_config_fp, "w") do |fp|
-                hayabusa = Hayabusa.new(hayabusa_conf)
-                
-                #Start web-server for proxy-requests.
-                hayabusa.start
-                
-                fp.write(Marshal.dump(
-                  :pid => Process.pid,
-                  :port => hayabusa.port
-                ))
-              end
-            end
-          end
-        ensure
-          File.open(fcgi_config_fp).flock(File::LOCK_UN)
-        end
-      end
-      
-      
-      
-      if fcgi_proxy
-        #Proxy request to the host-FCGI-process.
-        $stderr.puts "[hayabusa] Proxying request." if debug
-        cgi_tools.proxy_request_to(:cgi => cgi, :http => fcgi_proxy[:http])
-      else
-        #Host the FCGI-process.
-        $stderr.puts "[hayabusa] Running request as CGI." if debug
-        
-        #Enforce $stdout variable.
-        $stdout = hayabusa.cio
-        
-        #The rest is copied from the FCGI-part.
-        headers = {}
-        cgi.env_table.each do |key, val|
-          if key[0, 5] == "HTTP_" and key != "HTTP_HAYABUSA_FCGI_CONFIG"
-            key = key[5, key.length].gsub("_", " ").gsub(" ", "-")
-            headers[key] = val
-          end
-        end
-        
-        meta = cgi.env_table.to_hash
-        
-        uri = Knj::Web.parse_uri(meta["REQUEST_URI"])
-        meta["PATH_TRANSLATED"] = File.basename(uri[:path])
-        
-        cgi_data = {
-          :cgi => cgi,
-          :headers => headers,
-          :get => Knj::Web.parse_urlquery(cgi.env_table["QUERY_STRING"], :urldecode => true, :force_utf8 => true),
-          :meta => meta
-        }
-        if cgi.request_method == "POST"
-          cgi_data[:post] = cgi_tools.convert_fcgi_post(cgi.params)
-        else
-          cgi_data[:post] = {}
-        end
-        
-        hayabusa.config[:cgi] = cgi_data
-        
-        
-        #Handle request.
-        hayabusa.start_cgi_request
-      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)
-      cgi.print Knj.p(cgi_data, true) if cgi_data
-    end
-  end
+  fcgi = Hayabusa::Fcgi.new
+  fcgi.fcgi_loop
 rescue Exception => e
   if !e.is_a?(Interrupt)
     File.open(error_log_file, "w") do |fp|

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hayabusa}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-17}
+  s.date = %q{2012-08-19}
   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"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/hayabusa_ext/threadding_timeout.rb",
     "lib/hayabusa_ext/translations.rb",
     "lib/hayabusa_ext/web.rb",
+    "lib/hayabusa_fcgi.rb",
     "lib/hayabusa_http_server.rb",
     "lib/hayabusa_http_session.rb",
     "lib/hayabusa_http_session_contentgroup.rb",
@@ -119,6 +120,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mail>, [">= 0"])
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
+      s.add_runtime_dependency(%q<tpool>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -130,6 +132,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mail>, [">= 0"])
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
+      s.add_dependency(%q<tpool>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -142,6 +145,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
+    s.add_dependency(%q<tpool>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/lib/hayabusa.rb

@@ -47,7 +47,8 @@ class Hayabusa
     gems = [
       [:Erubis, "erubis"],
       [:Knj, "knjrbfw"],
-      [:Tsafe, "tsafe"]
+      [:Tsafe, "tsafe"],
+      [:Tpool, "tpool"]
     ]
     
     gems.each do |gem|
@@ -96,6 +97,20 @@ class Hayabusa
     
     
     @debug = @config[:debug]
+    if @debug
+      if !@config.key?(:debug_log) or @config[:debug_log]
+        @debug_log = true
+      else
+        @debug_log = false
+      end
+      
+      if !@config.key?(:debug_print) or @config[:debug_print]
+        @debug_print = true
+      else
+        @debug_print = false
+      end
+    end
+    
     @paused = 0
     @paused_mutex = Mutex.new
     @should_restart = false
@@ -106,6 +121,11 @@ class Hayabusa
     @eruby_cache = {}
     @httpsessions_ids = {}
     
+    if @debug_log
+      @log_fp = File.open("/tmp/hayabusa_#{@config[:title]}.log", "w")
+      @log_fp.sync = true
+    end
+    
     @path_hayabusa = File.dirname(__FILE__)
     
     
@@ -115,7 +135,7 @@ class Hayabusa
         "#{@path_hayabusa}/class_customio.rb"
       ]
       
-      print "Auto restarting.\n" if @debug
+      self.log_puts "Auto restarting." if @debug
       @mod_event = Knj::Event_filemod.new(:wait => 2, :paths => paths, &self.method(:on_event_filemod))
     end
     
@@ -149,12 +169,12 @@ class Hayabusa
     ]
     
     files.each do |file|
-      STDOUT.print "Loading: '#{file}'.\n" if @debug
+      self.log_puts "Loading: '#{file}'." if @debug
       self.loadfile(file)
     end
     
     
-    print "Setting up database.\n" if @debug
+    self.log_puts "Setting up database." if @debug
     if @config[:db].is_a?(Knj::Db)
       @db = @config[:db]
     elsif @config[:db].is_a?(Hash)
@@ -182,7 +202,7 @@ class Hayabusa
     
     
     if !@config.key?(:dbrev) or @config[:dbrev]
-      print "Updating database.\n" if @debug
+      self.log_puts "Updating database." if @debug
       dbrev_args = {"schema" => Hayabusa::Database::SCHEMA, "db" => @db}
       dbrev_args.merge!(@config[:dbrev_args]) if @config.key?(:dbrev_args)
       Knj::Db::Revision.new.init_db(dbrev_args)
@@ -190,7 +210,7 @@ class Hayabusa
     end
     
     
-    print "Spawning objects.\n" if @debug
+    self.log_puts "Spawning objects." if @debug
     @ob = Knj::Objects.new(
       :db => db,
       :class_path => @path_hayabusa,
@@ -216,12 +236,12 @@ class Hayabusa
     require "#{@path_hayabusa}/kernel_ext/gettext_methods" if @config[:locales_gettext_funcs]
     
     if @config[:magic_methods] or !@config.has_key?(:magic_methods)
-      print "Loading magic-methods.\n" if @debug
+      self.log_puts "Loading magic-methods." if @debug
       require "#{@path_hayabusa}/kernel_ext/magic_methods"
     end
     
     if @config[:customio] or !@config.has_key?(:customio)
-      print "Loading custom-io.\n" if @debug
+      self.log_puts "Loading custom-io." if @debug
       
       if $stdout.class.name != "Hayabusa::Custom_io"
         @cio = Hayabusa::Custom_io.new
@@ -231,7 +251,7 @@ class Hayabusa
     
     
     #Save the PID to the run-file.
-    print "Setting run-file.\n" if @debug
+    self.log_puts "Setting run-file." if @debug
     tmpdir = "#{Knj::Os.tmpdir}/hayabusa"
     tmppath = "#{tmpdir}/run_#{@config[:title]}"
     
@@ -248,7 +268,7 @@ class Hayabusa
     
     #Set up various events for the appserver.
     if !@config.key?(:events) or @config[:events]
-      print "Loading events.\n" if @debug
+      self.log_puts "Loading events." if @debug
       @events = Knj::Event_handler.new
       @events.add_event(
         :name => :check_page_access,
@@ -284,34 +304,34 @@ class Hayabusa
     
     
     #Initialize the various feature-modules.
-    print "Init sessions.\n" if @debug
+    self.log_puts "Init sessions." if @debug
     self.initialize_sessions
     
     if !@config.key?(:threadding) or @config[:threadding]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/threadding.rb")
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/threadding_timeout.rb")
-      print "Init threadding.\n" if @debug
+      self.log_puts "Init threadding." if @debug
       self.initialize_threadding
     end
     
-    print "Init mailing.\n" if @debug
+    self.log_puts "Init mailing." if @debug
     self.initialize_mailing
     
-    print "Init errors.\n" if @debug
+    self.log_puts "Init errors." if @debug
     self.initialize_errors
     
-    print "Init logging.\n" if @debug
+    self.log_puts "Init logging." if @debug
     self.initialize_logging
     
     if !@config.key?(:cleaner) or @config[:cleaner]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/cleaner.rb")
-      print "Init cleaner.\n" if @debug
+      self.log_puts "Init cleaner." if @debug
       self.initialize_cleaner
     end
     
     if !@config.key?(:cmdline) or @config[:cmdline]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/cmdline.rb")
-      print "Init cmdline.\n" if @debug
+      self.log_puts "Init cmdline." if @debug
       self.initialize_cmdline
     end
     
@@ -320,7 +340,13 @@ class Hayabusa
     Kernel.at_exit(&self.method(:stop))
     
     
-    print "Appserver spawned.\n" if @debug
+    self.log_puts "Appserver spawned." if @debug
+  end
+  
+  #Outputs to stderr and logs it.
+  def log_puts(str)
+    @log_fp.puts str if @debug_log
+    STDOUT.puts str if @debug_print
   end
   
   def no_date(event, classname)
@@ -328,7 +354,7 @@ class Hayabusa
   end
   
   def on_event_filemod(event, path)
-    print "File changed - restart server: #{path}\n"
+    self.log_puts "File changed - restart server: #{path}"
     @should_restart = true
     @mod_event.destroy if @mod_event
   end
@@ -360,25 +386,23 @@ class Hayabusa
   #Starts the HTTP-server and threadpool.
   def start
     #Start the appserver.
-    print "Spawning appserver.\n" if @debug
+    self.log_puts "Spawning appserver." if @debug
     @httpserv = Hayabusa::Http_server.new(self)
+    @httpserv.start
     
     
-    STDOUT.print "Starting appserver.\n" if @debug
+    self.log_puts "Starting appserver." if @debug
     Thread.current[:hayabusa] = {:hb => self} if !Thread.current[:hayabusa]
     
     if @config[:autoload]
-      STDOUT.print "Autoloading #{@config[:autoload]}\n" if @debug
+      self.log_puts "Autoloading #{@config[:autoload]}" if @debug
       require @config[:autoload]
     end
     
     begin
-      @threadpool.start if @threadpool
-      STDOUT.print "Threadpool startet.\n" if @debug
-      @httpserv.start
-      STDOUT.print "Appserver startet.\n" if @debug
+      self.log_puts "Appserver startet." if @debug
     rescue Interrupt => e
-      STDOUT.print "Got interrupt - trying to stop appserver.\n" if @debug
+      self.log_puts "Got interrupt - trying to stop appserver." if @debug
       self.stop
       raise e
     end
@@ -390,17 +414,17 @@ class Hayabusa
     @stop_called = true
     
     proc_stop = proc{
-      STDOUT.print "Stopping appserver.\n" if @debug
+      self.log_puts "Stopping appserver." if @debug
       @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
       
-      STDOUT.print "Stopping threadpool.\n" if @debug
+      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).
-      STDOUT.print "Flush out loaded sessions.\n" if @debug
+      self.log_puts "Flush out loaded sessions." if @debug
       self.sessions_flush
       
-      STDOUT.print "Stopping done...\n" if @debug
+      self.log_puts "Stopping done..." if @debug
     }
     
     #If we cant get a paused-execution in 5 secs - we just force the stop.
@@ -409,7 +433,7 @@ class Hayabusa
         self.paused_exec(&proc_stop)
       end
     rescue Timeout::Error, SystemExit, Interrupt
-      STDOUT.print "Forcing stop-appserver - couldnt get timing window.\n" if @debug
+      self.log_puts "Forcing stop-appserver - couldnt get timing window." if @debug
       proc_stop.call
     end
   end
@@ -472,7 +496,7 @@ class Hayabusa
     if @should_restart
       loop do
         if @should_restart_done
-          STDOUT.print "Ending join because the restart is done.\n"
+          self.log_puts "Ending join because the restart is done."
           break
         end
         
@@ -508,7 +532,7 @@ class Hayabusa
   def translations
     if !@translations
       #Start the Knj::Gettext_threadded- and Knj::Translations modules for translations.
-      print "Loading Gettext and translations.\n" if @debug
+      self.log_puts "Loading Gettext and translations." if @debug
       @translations = Knj::Translations.new(:db => @db)
       @ob.requireclass(:Translation, :require => false, :class => Knj::Translations::Translation)
     end