knjappserver 0.0.29 → 0.0.30

data/Gemfile

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

data/Gemfile.lock

@@ -22,6 +22,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
+    php4r (0.0.0)
+      datet
+      http2
     polyglot (0.3.3)
     rake (0.9.2.2)
     rspec (2.3.0)
@@ -51,6 +54,7 @@ DEPENDENCIES
   json
   knjrbfw
   mail
+  php4r
   rspec (~> 2.3.0)
   sqlite3
   tsafe

data/VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

data/bin/check_running.rb

@@ -50,7 +50,6 @@ if !options[:command]
 end
 
 require "#{options[:knjrbfw_path]}knjrbfw"
-require "knj/autoload"
 
 tmpdir = "#{Knj::Os.tmpdir}/knjappserver"
 tmppath = "#{tmpdir}/run_#{options[:title]}"

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-20}
+  s.date = %q{2012-08-03}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     "lib/pages/benchmark_threadded_content.rhtml",
     "lib/pages/debug_database_connections.rhtml",
     "lib/pages/debug_http_sessions.rhtml",
+    "lib/pages/debug_memory_usage.rhtml",
     "lib/pages/error_notfound.rhtml",
     "lib/pages/logs_latest.rhtml",
     "lib/pages/logs_show.rhtml",
@@ -106,6 +107,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tsafe>, [">= 0"])
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
+      s.add_runtime_dependency(%q<php4r>, [">= 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"])
@@ -118,6 +120,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<tsafe>, [">= 0"])
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
+      s.add_dependency(%q<php4r>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -131,6 +134,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tsafe>, [">= 0"])
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
+    s.add_dependency(%q<php4r>, [">= 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/include/class_erbhandler.rb

@@ -7,10 +7,7 @@ class Knjappserver::ERBHandler
     eruby = httpsess.eruby
     
 		if !@connected.key?(eruby.__id__)
-			eruby.connect("error") do |e|
-				_kas.handle_error(e)
-			end
-			
+			eruby.connect("error", &self.method(:on_error))
 			@connected[eruby.__id__] = true
 		end
 		
@@ -22,4 +19,9 @@ class Knjappserver::ERBHandler
     
     httpsess.resp.status = 500 if eruby.error
 	end
+	
+	#Handels the event when an error in the eruby-instance occurs.
+	def on_error(e)
+    _kas.handle_error(e)
+	end
 end

data/lib/include/class_httpserver.rb

@@ -82,15 +82,21 @@ class Knjappserver::Httpserver
     @http_sessions << Knjappserver::Httpsession.new(self, socket)
 	end
 	
-	def count_add
-    @mutex_count.synchronize do
-      @working_count += 1 if @working_count
-    end
-	end
-	
-	def count_remove
-    @mutex_count.synchronize do
-      @working_count -= 1 if @working_count
+	def count_block
+    begin
+      added = false
+      @mutex_count.synchronize do
+        @working_count += 1 if @working_count != nil
+        added = true
+      end
+      
+      yield
+    ensure
+      @kas.served += 1 if @kas
+      
+      @mutex_count.synchronize do
+        @working_count -= 1 if @working_count != nil and added
+      end
     end
 	end
 end

data/lib/include/class_httpsession.rb

@@ -23,7 +23,7 @@ class Knjappserver::Httpsession
     
     @eruby = Knj::Eruby.new(
       :cache_hash => @kas.eruby_cache,
-      :binding_callback => self.method("create_binding")
+      :binding_callback => self.method(:create_binding)
     )
     
     #Set socket stuff.
@@ -49,92 +49,86 @@ class Knjappserver::Httpsession
     
     @resp = Knjappserver::Httpsession::Http_response.new(:socket => @socket)
     @handler = Knjappserver::Httpsession::Http_request.new(:kas => @kas, :httpsession => self)
-    
-    @cgroup = Knjappserver::Httpsession::Contentgroup.new(
-      :socket => @socket,
-      :kas => @kas,
-      :resp => @resp,
-      :httpsession => self
-    )
+    @cgroup = Knjappserver::Httpsession::Contentgroup.new(:socket => @socket, :kas => @kas, :resp => @resp, :httpsession => self)
     @resp.cgroup = @cgroup
     
     Dir.chdir(@config[:doc_root])
     ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc) if @debug
     STDOUT.print "New httpsession #{self.__id__} (total: #{@httpserver.http_sessions.count}).\n" if @debug
     
-    @thread_request = Thread.new do
-      Thread.current[:knjappserver] = {} if !Thread.current[:knjappserver]
-      
-      begin
-        while @active
-          begin
-            @cgroup.reset
-            @written_size = 0
-            @size_send = @config[:size_send]
-            @alert_sent = false
-            @working = false
-            break if @kas.should_restart
-            
-            STDOUT.print "#{__id__} - Waiting to parse from socket.\n" if @debug
-            
-            #Timeout on sockets is currently broken in JRuby.
-            if RUBY_ENGINE == "jruby"
-              @handler.socket_parse(@socket)
-            else
-              Timeout.timeout(1800) do
-                @handler.socket_parse(@socket)
-              end
-            end
-            
-            STDOUT.print "#{__id__} - Done parsing from socket.\n" if @debug
-            
-            while @kas.paused? #Check if we should be waiting with executing the pending request.
-              STDOUT.print "#{__id__} - Paused! (#{@kas.paused}) - sleeping.\n" if @debug
+    @thread_request = Thread.new(&self.method(:thread_request_run))
+  end
+  
+  def thread_request_run
+    Thread.current[:knjappserver] = {} if !Thread.current[:knjappserver]
+    Thread.current[:type] = :httpsession
+    
+    if @config.key?(:max_requests_working)
+      max_requests_working = @config[:max_requests_working].to_i
+    else
+      max_requests_working = false
+    end
+    
+    begin
+      while @active
+        begin
+          @cgroup.reset
+          @written_size = 0
+          @size_send = @config[:size_send]
+          @alert_sent = false
+          @working = false
+          break if @kas.should_restart
+          
+          STDOUT.print "#{__id__} - Waiting to parse from socket.\n" if @debug
+          Timeout.timeout(1800) do
+            @handler.socket_parse(@socket)
+          end
+          
+          STDOUT.print "#{__id__} - Done parsing from socket.\n" if @debug
+          
+          while @kas.paused? #Check if we should be waiting with executing the pending request.
+            STDOUT.print "#{__id__} - Paused! (#{@kas.paused}) - sleeping.\n" if @debug
+            sleep 0.1
+          end
+          
+          break if @kas.should_restart
+          
+          if max_requests_working and @httpserver
+            while @httpserver.working_count.to_i >= max_requests_working
+              STDOUT.print "#{__id__} - Maximum amounts of requests are working (#{@httpserver.working_count}, #{max_requests_working}) - sleeping.\n" if @debug
               sleep 0.1
             end
-            
-            break if @kas.should_restart
-            
-            if @config.key?(:max_requests_working)
-              while @httpserver and @config and @httpserver.working_count.to_i >= @config[:max_requests_working].to_i
-                STDOUT.print "#{__id__} - Maximum amounts of requests are working (#{@httpserver.working_count}, #{@config[:max_requests_working]}) - sleeping.\n" if @debug
-                sleep 0.1
-              end
-            end
-            
-            #Reserve database connections.
-            @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
-            @kas.ob.db.get_and_register_thread if @kas.ob.db.opts[:threadsafe]
-            
-            @httpserver.count_add
-            @working = true
-            STDOUT.print "#{__id__} - Serving.\n" if @debug
-            
-            begin
-              self.serve
-            ensure
-              @httpserver.count_remove
-              @kas.served += 1 if @kas
-              @working = false
-            end
-          ensure
-            STDOUT.print "#{__id__} - Closing request.\n" if @debug
-            #Free reserved database-connections.
-            @kas.db_handler.free_thread if @kas and @kas.db_handler.opts[:threadsafe]
-            @kas.ob.db.free_thread if @kas and @kas.ob.db.opts[:threadsafe]
           end
+          
+          #Reserve database connections.
+          @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
+          @kas.ob.db.get_and_register_thread if @kas.ob.db.opts[:threadsafe]
+          
+          @working = true
+          STDOUT.print "#{__id__} - Serving.\n" if @debug
+          
+          @httpserver.count_block do
+            self.serve
+          end
+        ensure
+          STDOUT.print "#{__id__} - Closing request.\n" if @debug
+          @working = false
+          
+          #Free reserved database-connections.
+          @kas.db_handler.free_thread if @kas and @kas.db_handler.opts[:threadsafe]
+          @kas.ob.db.free_thread if @kas and @kas.ob.db.opts[:threadsafe]
         end
-      rescue Timeout::Error
-        STDOUT.print "#{__id__} - Closing httpsession because of timeout.\n" if @debug
-      rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE => e
-        STDOUT.print "#{__id__} - Connection error (#{e.inspect})...\n" if @debug
-      rescue Interrupt => e
-        raise e
-      rescue Exception => e
-        STDOUT.puts Knj::Errors.error_str(e)
-      ensure
-        self.destruct
       end
+    rescue Timeout::Error
+      STDOUT.print "#{__id__} - Closing httpsession because of timeout.\n" if @debug
+    rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE => e
+      STDOUT.print "#{__id__} - Connection error (#{e.inspect})...\n" if @debug
+    rescue Interrupt => e
+      raise e
+    rescue Exception => e
+      STDOUT.puts Knj::Errors.error_str(e)
+    ensure
+      self.destruct
     end
   end
   

data/lib/include/class_knjappserver.rb

@@ -1,9 +1,10 @@
-require "timeout"
+require "base64"
 require "digest"
 require "erubis"
-require "base64"
+require "monitor"
 require "stringio"
 require "socket"
+require "timeout"
 require "tsafe" if !Kernel.const_defined?(:Tsafe)
 
 #The class that stands for the whole appserver / webserver.
@@ -44,7 +45,7 @@ class Knjappserver
     
     
     #Require gems.
-    gems = %w[datet]
+    gems = %w[datet php4r]
     gems.each do |gem|
       puts "Loading gem: '#{gem}'." if @debug
       require gem
@@ -67,9 +68,7 @@ class Knjappserver
     
     
     #Add extra handlers if given.
-    if @config[:handlers_extra]
-      @config[:handlers] += @config[:handlers_extra]
-    end
+    @config[:handlers] += @config[:handlers_extra] if @config[:handlers_extra]
     
     
     #Setup cache to make .rhtml-calls faster.
@@ -108,11 +107,7 @@ class Knjappserver
       ]
       
       print "Auto restarting.\n" if @debug
-      @mod_event = Knj::Event_filemod.new(:wait => 2, :paths => paths) do |event, path|
-        print "File changed - restart server: #{path}\n"
-        @should_restart = true
-        @mod_event.destroy if @mod_event
-      end
+      @mod_event = Knj::Event_filemod.new(:wait => 2, :paths => paths, &self.method(:on_event_filemod))
     end
     
     
@@ -166,15 +161,15 @@ class Knjappserver
     
     if !@config.key?(:dbrev) or @config[:dbrev]
       print "Updating database.\n" if @debug
-      require "knj/knjdb/revision.rb"
       
       dbschemapath = "#{File.dirname(__FILE__)}/../files/database_schema.rb"
       raise "'#{dbschemapath}' did not exist." if !File.exists?(dbschemapath)
       require dbschemapath
       raise "No schema-variable was spawned." if !Knjappserver::DATABASE_SCHEMA
-      
-      dbrev = Knj::Db::Revision.new
-      dbrev.init_db("schema" => Knjappserver::DATABASE_SCHEMA, "db" => @db)
+      dbrev_args = {"schema" => Knjappserver::DATABASE_SCHEMA, "db" => @db}
+      dbrev_args.merge!(@config[:dbrev_args]) if @config.key?(:dbrev_args)
+      Knj::Db::Revision.new.init_db(dbrev_args)
+      dbrev_args = nil
     end
     
     
@@ -186,9 +181,7 @@ class Knjappserver
       :datarow => true,
       :knjappserver => self
     )
-    @ob.events.connect(:no_date) do |event, classname|
-      "[no date]"
-    end
+    @ob.events.connect(:no_date, &self.method(:no_date))
     
     
     if @config[:httpsession_db_args]
@@ -312,14 +305,22 @@ class Knjappserver
     
     
     #Clear memory at exit.
-    Kernel.at_exit do
-      self.stop
-    end
+    Kernel.at_exit(&self.method(:stop))
     
     
     print "Appserver spawned.\n" if @debug
   end
   
+  def no_date(event, classname)
+    return "[no date]"
+  end
+  
+  def on_event_filemod(event, path)
+    print "File changed - restart server: #{path}\n"
+    @should_restart = true
+    @mod_event.destroy if @mod_event
+  end
+  
   #If you want to use auto-restart, every file reloaded through loadfile will be watched for changes. When changed the server will do a restart to reflect that.
   def loadfile(fpath)
     if !@config[:autorestart]

data/lib/include/class_knjappserver_cleaner.rb

@@ -1,101 +1,108 @@
 class Knjappserver
 	def initialize_cleaner
-    if @config[:autorestart]
-      time = 1
-    else
-      time = 15
-    end
-    
     #This should not be runned via _kas.timeout because timeout wont run when @should_restart is true! - knj
-    Thread.new do
-      begin
-        loop do
-          sleep time
+    Thread.new(&self.method(:clean_autorestart))
+    
+    #This flushes (writes) all session-data to the server and deletes old unused sessions from the database.
+    self.timeout(:time => @config[:cleaner_timeout], &self.method(:clean_sessions))
+	end
+	
+	def clean
+    self.clean_sessions
+    self.clean_autorestart
+	end
+	
+	def clean_autorestart
+    begin
+      if @config[:autorestart]
+        time = 1
+      else
+        time = 15
+      end
+      
+      loop do
+        sleep time
+        
+        if @config.has_key?(:restart_when_used_memory) and !@should_restart
+          mbs_used = (Php4r.memory_get_usage / 1024) / 1024
+          STDOUT.print "Restart when over #{@config[:restart_when_used_memory]}mb\n" if @config[:debug]
+          STDOUT.print "Used: #{mbs_used}mb\n" if @config[:debug]
           
-          if @config.has_key?(:restart_when_used_memory) and !@should_restart
-            mbs_used = (Knj::Php.memory_get_usage / 1024) / 1024
-            STDOUT.print "Restart when over #{@config[:restart_when_used_memory]}mb\n" if @config[:debug]
-            STDOUT.print "Used: #{mbs_used}mb\n" if @config[:debug]
-            
-            if mbs_used.to_i >= @config[:restart_when_used_memory].to_i
-              STDOUT.print "Memory is over #{@config[:restart_when_used_memory]} - restarting.\n"
-              @should_restart = true
-            end
+          if mbs_used.to_i >= @config[:restart_when_used_memory].to_i
+            STDOUT.print "Memory is over #{@config[:restart_when_used_memory]} - restarting.\n"
+            @should_restart = true
           end
-          
-          if @should_restart and !@should_restart_done and !@should_restart_runnning
+        end
+        
+        if @should_restart and !@should_restart_done and !@should_restart_runnning
+          begin
+            @should_restart_runnning = true
+            
+            #When we begin to restart it should go as fast as possible - so start by flushing out any emails waiting so it goes faster the last time...
+            STDOUT.print "Flushing mails.\n"
+            self.mail_flush
+            
+            #Lets try to find a time where no thread is working within the next 30 seconds. If we cant - we interrupt after 10 seconds and restart the server.
             begin
-              @should_restart_runnning = true
-              
-              #When we begin to restart it should go as fast as possible - so start by flushing out any emails waiting so it goes faster the last time...
-              STDOUT.print "Flushing mails.\n"
-              self.mail_flush
-              
-              #Lets try to find a time where no thread is working within the next 30 seconds. If we cant - we interrupt after 10 seconds and restart the server.
-              begin
-                Timeout.timeout(30) do
-                  loop do
-                    working_count = self.httpserv.working_count
-                    working = false
-                    
-                    if working_count and working_count > 0
-                      working = true
-                      STDOUT.print "Someone is working - wait two sec and try to restart again!\n"
-                    end
-                    
-                    if !working
-                      STDOUT.print "Found window where no sessions were active - restarting!\n"
-                      break
-                    else
-                      sleep 0.2
-                    end
-                    
-                    STDOUT.print "Trying to find window with no active sessions to restart...\n"
+              Timeout.timeout(30) do
+                loop do
+                  working_count = self.httpserv.working_count
+                  working = false
+                  
+                  if working_count and working_count > 0
+                    working = true
+                    STDOUT.print "Someone is working - wait two sec and try to restart again!\n"
+                  end
+                  
+                  if !working
+                    STDOUT.print "Found window where no sessions were active - restarting!\n"
+                    break
+                  else
+                    sleep 0.2
                   end
+                  
+                  STDOUT.print "Trying to find window with no active sessions to restart...\n"
                 end
-              rescue Timeout::Error
-                STDOUT.print "Could not find a timing window for restarting... Forcing restart!\n"
-              end
-              
-              #Flush emails again if any are pending (while we tried to find a window to restart)...
-              STDOUT.print "Flushing mails.\n"
-              self.mail_flush
-              
-              STDOUT.print "Stopping appserver.\n"
-              self.stop
-              
-              STDOUT.print "Figuring out restart-command.\n"
-              mycmd = @config[:restart_cmd]
-              
-              if !mycmd or mycmd.to_s.strip.length <= 0
-                fpath = File.realpath("#{File.dirname(__FILE__)}/../knjappserver.rb")
-                mycmd = Knj::Os.executed_cmd
-                
-                STDOUT.print "Previous cmd: #{mycmd}\n"
-                mycmd = mycmd.gsub(/\s+knjappserver.rb/, " #{Knj::Strings.unixsafe(fpath)}")
               end
+            rescue Timeout::Error
+              STDOUT.print "Could not find a timing window for restarting... Forcing restart!\n"
+            end
+            
+            #Flush emails again if any are pending (while we tried to find a window to restart)...
+            STDOUT.print "Flushing mails.\n"
+            self.mail_flush
+            
+            STDOUT.print "Stopping appserver.\n"
+            self.stop
+            
+            STDOUT.print "Figuring out restart-command.\n"
+            mycmd = @config[:restart_cmd]
+            
+            if !mycmd or mycmd.to_s.strip.length <= 0
+              fpath = File.realpath("#{File.dirname(__FILE__)}/../knjappserver.rb")
+              mycmd = Knj::Os.executed_cmd
               
-              STDOUT.print "Restarting knjAppServer with command: #{mycmd}\n"
-              @should_restart_done = true
-              print exec(mycmd)
-              exit
-            rescue => e
-              STDOUT.puts e.inspect
-              STDOUT.puts e.backtrace
+              STDOUT.print "Previous cmd: #{mycmd}\n"
+              mycmd = mycmd.gsub(/\s+knjappserver.rb/, " #{Knj::Strings.unixsafe(fpath)}")
             end
+            
+            STDOUT.print "Restarting knjAppServer with command: #{mycmd}\n"
+            @should_restart_done = true
+            print exec(mycmd)
+            exit
+          rescue => e
+            STDOUT.puts e.inspect
+            STDOUT.puts e.backtrace
           end
         end
-      rescue => e
-        self.handle_error(e)
       end
+    rescue => e
+      self.handle_error(e)
     end
-    
-    #This flushes (writes) all session-data to the server and deletes old unused sessions from the database.
-    self.timeout(:time => @config[:cleaner_timeout], &self.method("clean"))
 	end
 	
 	#This method can be used to clean the appserver. Dont call this from a HTTP-request.
-	def clean
+	def clean_sessions
     STDOUT.print "Cleaning sessions on appserver.\n" if @config[:debug]
     
     #Clean up various inactive sessions.

data/lib/include/class_knjappserver_cmdline.rb

@@ -30,15 +30,18 @@ class Knjappserver
       end
     end
     
-    self.cmd_connect(/^\s*restart\s*$/i) do |data|
-      print "Restart will begin shortly.\n"
-      self.should_restart = true
-    end
-    
-    self.cmd_connect(/^\s*stop\s*$/i) do |data|
-      print "Stopping appserver.\n"
-      self.stop
-    end
+    self.cmd_connect(/^\s*restart\s*$/i, &self.method(:cmdline_on_restart_cmd))
+    self.cmd_connect(/^\s*stop\s*$/i, &self.method(:cmdline_on_stop_cmd))
+  end
+  
+  def cmdline_on_restart_cmd(data)
+    print "Restart will begin shortly.\n"
+    self.should_restart = true
+  end
+  
+  def cmdline_on_stop_cmd(data)
+    print "Stopping appserver.\n"
+    self.stop
   end
   
   #Connects a proc to a specific command in the command-line (key should be a regex).

data/lib/include/class_knjappserver_errors.rb

@@ -13,9 +13,7 @@ class Knjappserver
       @error_emails_time = 180
     end
     
-    self.timeout(:time => @error_emails_time) do
-      self.flush_error_emails
-    end
+    self.timeout(:time => @error_emails_time, &self.method(:flush_error_emails))
   end
   
   #Send error-emails based on error-emails-cache (cached so the same error isnt send out every time it occurrs to prevent spamming).
@@ -99,12 +97,12 @@ class Knjappserver
           html << "#{Knj::Web.html(line)}<br />"
         end
         
-        html << "<br /><b>Post:</b><br /><pre>#{Knj::Php.print_r(_post, true)}</pre>" if _post
-        html << "<br /><b>Get:</b><br /><pre>#{Knj::Php.print_r(_get, true)}</pre>" if _get
-        html << "<br /><b>Server:</b><br /><pre>#{Knj::Php.print_r(_server, true).html}</pre>" if _server
-        html << "<br /><b>Cookie:</b><br /><pre>#{Knj::Php.print_r(_cookie, true).html}</pre>" if _meta
-        html << "<br /><b>Session:</b><br /><pre>#{Knj::Php.print_r(_session, true).html}</pre>" if _session
-        html << "<br /><b>Session hash:</b><br /><pre>#{Knj::Php.print_r(_session_hash, true).html}</pre>" if _session_hash
+        html << "<br /><b>Post:</b><br /><pre>#{Php4r.print_r(_post, true)}</pre>" if _post
+        html << "<br /><b>Get:</b><br /><pre>#{Php4r.print_r(_get, true)}</pre>" if _get
+        html << "<br /><b>Server:</b><br /><pre>#{Php4r.print_r(_server, true).html}</pre>" if _server
+        html << "<br /><b>Cookie:</b><br /><pre>#{Php4r.print_r(_cookie, true).html}</pre>" if _meta
+        html << "<br /><b>Session:</b><br /><pre>#{Php4r.print_r(_session, true).html}</pre>" if _session
+        html << "<br /><b>Session hash:</b><br /><pre>#{Php4r.print_r(_session_hash, true).html}</pre>" if _session_hash
         
         error_hash = @error_emails_pending[backtrace_hash]
         error_hash[:last_time] = Time.new
@@ -124,7 +122,7 @@ class Knjappserver
   
   #Prints a detailed overview of the object in the terminal from where the appserver was started. This can be used for debugging.
   def dprint(obj)
-    STDOUT.print Knj::Php.print_r(obj, true)
+    STDOUT.print Php4r.print_r(obj, true)
   end
   
   #Prints a string with a single file-line-backtrace prepended which is useful for debugging.

data/lib/include/class_knjappserver_leakproxy_server.rb

@@ -44,7 +44,7 @@ class Knjappserver::Leakproxy_server
             STDOUT.print obj["str"]
           end
         else
-          STDOUT.print Knj::Php.print_r(obj, true)
+          STDOUT.print Php4r.print_r(obj, true)
         end
       }
     )

data/lib/include/class_knjappserver_logging.rb

@@ -4,16 +4,14 @@ class Knjappserver
 		@logs_mutex = Mutex.new
 		
 		if @config[:logging] and @config[:logging][:access_db]
-			self.timeout(:time => 30) do
-				if @logs_access_pending.length > 0
-					flush_access_log
-				end
-			end
+			self.timeout(:time => 30, &self.method(:flush_access_log))
 		end
 	end
 	
 	#Writes all queued access-logs to the database.
 	def flush_access_log
+    return nil if @logs_access_pending.empty?
+    
 		@logs_mutex.synchronize do
 			ins_arr = @logs_access_pending
 			@logs_access_pending = []
@@ -306,7 +304,9 @@ class Knjappserver
 	def logs_table(obj, args = {})
 		links = @ob.list(:Log_link, {"object_class" => obj.class.name, "object_id" => obj.id, "limit" => 500, "orderby" => [["id", "desc"]]})
 		
-		html = "<table class=\"list knjappserver_log_table\">"
+		html = ""
+		
+		html << "<table class=\"list knjappserver_log_table\">"
 		html << "<thead>"
 		html << "<tr>"
 		html << "<th>ID</th>"

data/lib/include/class_knjappserver_mailing.rb

@@ -8,10 +8,7 @@ class Knjappserver
 		@mails_waiting = []
 		@mails_mutex = Monitor.new
 		@mails_queue_mutex = Monitor.new
-		@mails_timeout = self.timeout(:time => 30) do
-      STDOUT.print "Flushing mails.\n" if @debug
-			self.mail_flush
-		end
+		@mails_timeout = self.timeout(:time => 30, &self.method(:mail_flush))
 	end
 	
 	#Queue a mail for sending. Possible keys are: :subject, :from, :to, :text and :html.
@@ -40,6 +37,8 @@ class Knjappserver
 	#Sends all queued mails to the respective servers, if we are online.
 	def mail_flush
 		@mails_mutex.synchronize do
+      STDOUT.print "Flushing mails.\n" if @debug
+      
       if @mails_waiting.length <= 0
         STDOUT.print "No mails to flush - skipping.\n" if @debug
         return false
@@ -83,6 +82,8 @@ class Knjappserver
         subproc.destroy if subproc
         subproc = nil
       end
+      
+      return nil
 		end
 	end
 	

data/lib/include/class_knjappserver_threadding.rb

@@ -4,9 +4,12 @@ class Knjappserver
     @config[:threadding][:max_running] = 8 if !@config[:threadding].has_key?(:max_running)
     
     @threadpool = Knj::Threadpool.new(:threads => @config[:threadding][:max_running], :sleep => 0.1)
-    @threadpool.events.connect(:on_error) do |event, error|
-      self.handle_error(error)
-    end
+    @threadpool.events.connect(:on_error, &self.method(:threadpool_on_error))
+  end
+  
+  #Callback for when an error occurs in the threadpool.
+  def threadpool_on_error(event, error)
+    self.handle_error(error)
   end
   
   #Inits the thread so it has access to the appserver and various magic methods can be used.
@@ -71,6 +74,7 @@ class Knjappserver
   #Spawns a thread to run the given proc and add the output of that block in the correct order to the HTML.
   def threadded_content(&block)
     _httpsession.threadded_content(block)
+    return nil
   end
 end
 

data/lib/include/class_knjappserver_translations.rb

@@ -1,15 +1,15 @@
 class Knjappserver
+  #Translates a given key for a given object.
+  #===Examples
+  # print _kas.trans(obj, :title) #=> "Trala"
   def trans(obj, key, args = {})
     args[:locale] = self.trans_locale if !args[:locale]
     trans_val = @translations.get(obj, key, args).to_s
-    
-    if trans_val.length <= 0
-      trans_val = @events.call(:trans_no_str, {:obj => obj, :key => key, :args => args})
-    end
-    
+    trans_val = @events.call(:trans_no_str, {:obj => obj, :key => key, :args => args}) if trans_val.length <= 0
     return trans_val
   end
   
+  #Returns the locale for the current thread.
   def trans_locale(args = {})
     if args.is_a?(Hash) and args[:locale]
       return args[:locale]
@@ -26,11 +26,17 @@ class Knjappserver
     raise "Could not figure out locale."
   end
   
+  #Sets new translations for the given object.
+  #===Examples
+  # _kas.trans_set(obj, {:title => "Trala"})
   def trans_set(obj, values, args = {})
     args[:locale] = self.trans_locale if !args[:locale]
     @translations.set(obj, values, args)
   end
   
+  #Deletes all translations for the given object.
+  #===Examples
+  # _kas.trans_del(obj)
   def trans_del(obj)
     @translations.delete(obj)
   end

data/lib/include/class_knjappserver_web.rb

@@ -1,7 +1,7 @@
 class Knjappserver
   #Imports a .rhtml-file and executes it.
   #===Examples
-  # _kas.import("/some/path/page.rhtml")
+  #  _kas.import("/some/path/page.rhtml")
   def import(filepath)
     if filepath.to_s.index("../proc/self") != nil
       raise Errno::EACCES, "Possible attempt to hack the appserver."
@@ -12,8 +12,8 @@ class Knjappserver
   
   #Redirects to another URL.
   #===Examples
-  # _kas.redirect("someotherpage.rhtml")
-  # _kas.redirect("newpage.rhtml", :perm => true)
+  #  _kas.redirect("someotherpage.rhtml")
+  #  _kas.redirect("newpage.rhtml", :perm => true)
   def redirect(url, args = {})
     #Header way
     if !_httpsession.alert_sent and !self.headers_sent?
@@ -32,7 +32,7 @@ class Knjappserver
   
   #Sends a javascript-alert to the HTML.
   #===Examples
-  # _kas.alert("Hello world!")
+  #  _kas.alert("Hello world!")
   def alert(msg)
     _httpsession.alert_sent = true
     Knj::Web.alert(msg)
@@ -41,33 +41,36 @@ class Knjappserver
   
   #Define a cookies in the clients browser.
   #===Examples
-  # _kas.cookie(:name => "MyCookie", :value => "Trala")
+  #  _kas.cookie(:name => "MyCookie", :value => "Trala")
   def cookie(cookie)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
     raise "Not a hash: '#{cookie.class.name}', '#{cookie}'." unless cookie.is_a?(Hash)
     _httpsession.resp.cookie(cookie)
+    return nil
   end
   
   #Sends a header to the clients browser.
   #===Examples
-  # _kas.header("Content-Type", "text/javascript")
+  #  _kas.header("Content-Type", "text/javascript")
   def header(key, val)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
     _httpsession.resp.header(key, val)
+    return nil
   end
   
   #Sends a raw header-line to the clients browser.
   def header_raw(str)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
-    Knj::Php.header(str)
+    Php4r.header(str)
+    return nil
   end
   
   #Returns true if the headers are already sent.
   #===Examples
-  # _kas.headers_sent? #=> true
+  #  _kas.headers_sent? #=> true
   def headers_sent?
     return true if _httpsession.resp.headers_sent
     return false
@@ -76,16 +79,17 @@ class Knjappserver
   #Define the size for when to automatically send headers. If you want to send hundres of kilobytes and then a header, you can use this method to do so.
   #===Examples
   #Set the size to 200 kb.
-  # _kas.headers_send_size = (1024 * 200)
+  #  _kas.headers_send_size = (1024 * 200)
   def headers_send_size=(newsize)
     raise "The headers are already sent and you cannot modify the send-size any more." if self.headers_sent?
     _httpsession.size_send = newsize.to_i
+    return nil
   end
   
   #Serves the given filepath and enables caching for it. No other content should be written to the page when using this method.
   #===Examples
-  # _kas.header("Content-Type", "text/javascript")
-  # _kas.serve_file("somefile.js")
+  #  _kas.header("Content-Type", "text/javascript")
+  #  _kas.serve_file("somefile.js")
   def serve_file(filepath)
     raise "File doesnt exist: '#{filepath}'." if !File.exists?(filepath)
     httpsess = _httpsession
@@ -115,6 +119,7 @@ class Knjappserver
     end
     
     httpsess.force_content(:type => :file, :path => filepath)
+    return nil
   end
   
   #Sends a javascript back to the browser and exits.
@@ -129,7 +134,7 @@ class Knjappserver
   
   #Urlencodes a string.
   #===Examples
-  # _kas.redirect("mypage.rhtml?arg=#{_kas.urlenc(value_variable)}")
+  #  _kas.redirect("mypage.rhtml?arg=#{_kas.urlenc(value_variable)}")
   def urlenc(str)
     return Knj::Web.urlenc(str)
   end

data/lib/pages/benchmark_simple.rhtml

@@ -1,3 +1,3 @@
 <%
-  Knj::Php.print_r([_get, _post, _meta])
+  Php4r.print_r([_get, _post, _meta])
 %>

data/lib/pages/debug_memory_usage.rhtml

@@ -0,0 +1,16 @@
+<%
+  if _get["choice"] == "dogarbagecollect"
+    GC.start
+    _kas.redirect("?show=debug_memory_usage")
+  end
+%>
+
+<h1>Memory usage</h1>
+
+<div style="padding-bottom: 15px;">
+  <input type="button" value="Garbage collect" onclick="location.href='?show=debug_memory_usage&amp;choice=dogarbagecollect';" />
+</div>
+
+<%
+  Knj::Memory_analyzer.new.write
+%>

data/lib/scripts/knjappserver_cgi.rb

@@ -107,7 +107,7 @@ begin
   
   #cgi.print "Content-Type: text/html\r\n"
   #cgi.print "\r\n"
-  #cgi.print Knj::Php.print_r(cgi.params, true)
+  #cgi.print Php4r.print_r(cgi.params, true)
   
   if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
     count = 0

data/lib/scripts/knjappserver_fcgi.rb

@@ -74,7 +74,7 @@ FCGI.each_cgi do |cgi|
     headers = {}
     cgi.env_table.each do |key, val|
       if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
-        key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
+        key = Php4r.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
         headers[key] = val
       end
     end
@@ -92,7 +92,7 @@ FCGI.each_cgi do |cgi|
     
     #cgi.print "Content-Type: text/html\r\n"
     #cgi.print "\r\n"
-    #cgi.print Knj::Php.print_r(cgi.params, true)
+    #cgi.print Php4r.print_r(cgi.params, true)
     
     if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
       count = 0

metadata

@@ -2,7 +2,7 @@
 name: knjappserver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 +02:00
+date: 2012-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,19 +80,30 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: php4r
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +111,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,10 +122,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +133,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,7 +144,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables: 
@@ -200,6 +211,7 @@ files:
 - lib/pages/benchmark_threadded_content.rhtml
 - lib/pages/debug_database_connections.rhtml
 - lib/pages/debug_http_sessions.rhtml
+- lib/pages/debug_memory_usage.rhtml
 - lib/pages/error_notfound.rhtml
 - lib/pages/logs_latest.rhtml
 - lib/pages/logs_show.rhtml
@@ -230,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4291663965426138445
+      hash: 676583393387932093
       segments: 
       - 0
       version: "0"