knjappserver 0.0.15 → 0.0.16

data/lib/include/class_httpsession_contentgroup.rb

@@ -0,0 +1,144 @@
+#This class handels the adding of content and writing to socket. Since this can be done with multiple threads and multiple IO's it can get complicated.
+class Knjappserver::Httpsession::Contentgroup
+  attr_reader :done, :cur_data
+  attr_accessor :chunked, :socket
+  NL = "\r\n"
+  
+  def initialize(args = {})
+    @block = args[:restart_proc]
+    @socket = args[:socket]
+    @chunked = args[:chunked]
+    @mutex = Mutex.new
+    @debug = false
+  end
+  
+  def init
+    @done = false
+    @thread = nil
+    @cur_data = {
+      :str => "",
+      :done => false
+    }
+    @ios = [@cur_data]
+  end
+  
+  def reset
+    @ios = []
+    @done = false
+    @thread = nil
+    
+    @mutex.synchronize do
+      self.new_io
+    end
+    
+    self.register_thread
+  end
+  
+  def new_io(obj = "")
+    @cur_data[:done] = true if @cur_data
+    @cur_data = {:str => obj, :done => false}
+    @ios << @cur_data
+  end
+  
+  def register_thread
+    Thread.current[:knjappserver] = {} if !Thread.current[:knjappserver]
+    Thread.current[:knjappserver][:contentgroup] = self
+  end
+  
+  def new_thread
+    @mutex.synchronize do
+      cgroup = Knjappserver::Httpsession::Contentgroup.new(:socket => @socket, :chunked => @chunked)
+      cgroup.init
+      
+      data = {:cgroup => cgroup}
+      @ios << data
+      self.new_io
+      self.register_thread
+      
+      return data
+    end
+  end
+  
+  def write(cont)
+    @mutex.synchronize do
+      @cur_data[:str] << cont.to_s
+    end
+  end
+  
+  def write_output
+    if @block and !@thread
+      @mutex.synchronize do
+        @thread = Knj::Thread.new do
+          @block.call
+        end
+      end
+    end
+  end
+  
+  def mark_done
+    @cur_data[:done] = true
+    @done = true
+  end
+  
+  def join
+    if @block
+      sleep 0.1 while !@thread
+      @thread.join
+    end
+  end
+  
+  def write_to_socket
+    count = 0
+    
+    @ios.each do |data|
+      if data.key?(:cgroup)
+        data[:cgroup].write_to_socket
+      elsif data.key?(:str)
+        if data[:str].is_a?(File)
+          file = data[:str]
+          
+          loop do
+            begin
+              buf = file.sysread(4096)
+            rescue EOFError
+              break
+            end
+            
+            if @chunked
+              @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
+            else
+              @socket.write(buf)
+            end
+          end
+          
+          file.close
+        else
+          loop do
+            break if data[:done] and data[:str].size <= 0 
+            sleep 0.1 while data[:str].size <= 512 and !data[:done]
+            
+            str = nil
+            @mutex.synchronize do
+              str = data[:str].bytes
+              data[:str] = ""
+            end
+            
+            str.each_slice(512) do |slice|
+              buf = slice.pack("C*")
+              
+              if @chunked
+                @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
+              else
+                @socket.write(buf)
+              end
+            end
+          end
+        end
+      else
+        raise "Unknown object: '#{data.class.name}'."
+      end
+    end
+    
+    count += 1
+  end
+end

data/lib/include/class_httpsession_knjengine.rb

@@ -1,12 +1,11 @@
 require "uri"
-require "cgi"
 
 if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
   BasicSocket.do_not_reverse_lookup = true
 end
 
 class Knjappserver::Httpsession::Knjengine
-	attr_reader :get, :post, :cookie, :meta, :page_path, :headers
+	attr_reader :get, :post, :cookie, :meta, :page_path, :headers, :http_version
 	
 	def initialize(args)
 		@args = args
@@ -18,7 +17,7 @@ class Knjappserver::Httpsession::Knjengine
 		loop do
 			raise Errno::ECONNRESET, "Socket closed." if @socket.closed?
 			read = @socket.gets
-			raise Errno::ECONNRESET, "Socket returned non-string." if !read.is_a?(String)
+			raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
 			@cont += read
 			break if @cont[-4..-1] == "\r\n\r\n" or @cont[-2..-1] == "\n\n"
 		end
@@ -31,21 +30,21 @@ class Knjappserver::Httpsession::Knjengine
 		
 		#Parse URI (page_path and get).
 		match = @cont.match(/^(GET|POST|HEAD) (.+) HTTP\/1\.(\d+)\s*/)
-		if !match
-			raise "Could not parse request: '#{@cont.split("\n").first}'."
-		end
+		raise "Could not parse request: '#{@cont.split("\n").first}'." if !match
+    
+		@http_version = "1.#{match[3]}"
 		
 		method = match[1]
 		@cont = @cont.gsub(match[0], "")
 		uri = URI.parse(match[2])
 		
-		page_filepath = CGI.unescape(uri.path)
+		page_filepath = Knj::Web.urldec(uri.path)
 		if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@kas.config[:doc_root]}/#{page_filepath}")
 			page_filepath = "#{page_filepath}/#{@kas.config[:default_page]}"
 		end
 		
 		@page_path = "#{@kas.config[:doc_root]}/#{page_filepath}"
-		@get = Knj::Web.parse_urlquery(uri.query.to_s, {:urldecode => true})
+		@get = Knj::Web.parse_urlquery(uri.query.to_s, {:urldecode => true, :force_utf8 => true})
 		
 		
 		#Parse headers, cookies and meta.
@@ -83,26 +82,13 @@ class Knjappserver::Httpsession::Knjengine
 			@headers[key] << val
 			
 			case key
-				when "host"
-					@meta["HTTP_HOST"] = val
-				when "connection"
-					@meta["HTTP_CONNECTION"] = val
-				when "accept"
-					@meta["HTTP_ACCEPT"] = val
-				when "accept-encoding"
-					@meta["HTTP_ACCEPT_ENCODING"] = val
-				when "accept-language"
-					@meta["HTTP_ACCEPT_LANGUAGE"] = val
-				when "accept-charset"
-					@meta["HTTP_ACCEPT_CHARSET"] = val
-				when "user-agent"
-					@meta["HTTP_USER_AGENT"] = val
-				when "referer"
-					@meta["HTTP_REFERER"] = val
 				when "cookie"
 					Knj::Web.parse_cookies(val).each do |key, val|
 						@cookie[key] = val
 					end
+        else
+          key = key.upcase.gsub("-", "_")
+          @meta["HTTP_#{key}"] = val
 			end
 		end
 		
@@ -120,7 +106,7 @@ class Knjappserver::Httpsession::Knjengine
 			else
 				post_data.split("&").each do |splitted|
 					splitted = splitted.split("=")
-					post_treated[Knj::Php.urldecode(splitted[0])] = splitted[1]
+					post_treated[Knj::Web.urldec(splitted[0])] = splitted[1]
 				end
 			end
 			
@@ -137,53 +123,32 @@ class Knjappserver::Httpsession::Knjengine
 	#Thanks to WEBrick
 	def parse_form_data(io, boundary)
 		boundary_regexp = /\A--#{boundary}(--)?#{@crlf}\z/
-		form_data = Hash.new
+		form_data = {}
 		return form_data unless io
 		data = nil
-		io.each{|line|
+		
+		io.each do |line|
 		  if boundary_regexp =~ line
-			 if data
-				data.chop!
-				key = data.name
-				if form_data.has_key?(key)
-				  form_data[key].append_data(data)
-				else
-				  form_data[key] = data 
-				end
-			 end
-			 data = WEBrick::HTTPUtils::FormData.new
-			 next
+			  if data
+          data.chop!
+          key = data.name
+          
+          if form_data.has_key?(key)
+            form_data[key].append_data(data)
+          else
+            form_data[key] = data
+          end
+			  end
+			  
+			  data = WEBrick::HTTPUtils::FormData.new
+			  next
 		  else
-			 if data
-				data << line
-			 end
+			  if data
+				  data << line
+			  end
 		  end
-		}
-		return form_data
-	 end
-	
-	def destroy
-		@args.clear if @args
-		@args = nil
-		@kas = nil
-		@socket = nil
-		@cont = nil
-		
-		@meta.clear if @meta
-		@meta = nil
-		
-		@page_path = nil
-		
-		@get.clear if @get
-		@get = nil
-		
-		@post.clear if @post
-		@post = nil
-		
-		@headers.clear if @headers
-		@headers = nil
+		end
 		
-		@cookie.clear if @cookie
-		@cookie = nil
-	end
+		return form_data
+  end
 end

data/lib/include/class_httpsession_mongrel.rb

@@ -40,7 +40,7 @@ class Knjappserver::Httpsession::Webrick
 		@cookie = {}
 		
 		req.cookies.each do |cookie_enum|
-			@cookie[cookie_enum.name] = CGI.unescape(cookie_enum.value)
+			@cookie[cookie_enum.name] = Knj::Web.urldec(cookie_enum.value)
 		end
 		
 		

data/lib/include/class_httpsession_webrick.rb

@@ -40,7 +40,7 @@ class Knjappserver::Httpsession::Webrick
 		@cookie = {}
 		
 		req.cookies.each do |cookie_enum|
-			@cookie[cookie_enum.name] = CGI.unescape(cookie_enum.value)
+			@cookie[cookie_enum.name] = Knj::Web.urldec(cookie_enum.value)
 		end
 		
 		

data/lib/include/class_knjappserver.rb

@@ -1,9 +1,13 @@
+require "#{File.dirname(__FILE__)}/class_knjappserver_cleaner"
+require "#{File.dirname(__FILE__)}/class_knjappserver_cmdline"
 require "#{File.dirname(__FILE__)}/class_knjappserver_errors"
 require "#{File.dirname(__FILE__)}/class_knjappserver_logging"
 require "#{File.dirname(__FILE__)}/class_knjappserver_mailing"
+require "#{File.dirname(__FILE__)}/class_knjappserver_sessions"
 require "#{File.dirname(__FILE__)}/class_knjappserver_threadding"
+require "#{File.dirname(__FILE__)}/class_knjappserver_threadding_timeout"
+require "#{File.dirname(__FILE__)}/class_knjappserver_translations"
 require "#{File.dirname(__FILE__)}/class_knjappserver_web"
-require "#{File.dirname(__FILE__)}/class_knjappserver_cleaner"
 
 require "timeout"
 require "digest"
@@ -13,24 +17,30 @@ require "stringio"
 require "socket"
 
 class Knjappserver
-  attr_reader :config, :httpserv, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :paused, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_vars, :types, :eruby_cache
+  attr_reader :config, :httpserv, :debug, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_vars, :types, :eruby_cache
   attr_accessor :served, :should_restart, :should_restart_done
   
   autoload :ERBHandler, "#{File.dirname(__FILE__)}/class_erbhandler"
   
   def initialize(config)
     raise "No arguments given." if !config.is_a?(Hash)
+    
     @config = {
+      :host => "0.0.0.0",
       :timeout => 30,
       :default_page => "index.rhtml",
       :default_filetype => "text/html",
-      :max_requests_working => 20
+      :max_requests_working => 20,
+      :size_send => 1024
     }.merge(config)
     
+    @config[:smtp_args] = {"smtp_host" => "localhost", "smtp_port" => 25} if !@config[:smtp_args]
     @config[:timeout] = 30 if !@config.has_key?(:timeout)
     @config[:engine_knjengine] = true if !@config[:engine_knjengine] and !@config[:engine_webrick] and !@config[:engine_mongrel]
     raise "No ':doc_root' was given in arguments." if !@config.has_key?(:doc_root)
     
+    
+    #Setup default handlers if none are given.
     if !@config.has_key?(:handlers)
       @erbhandler = Knjappserver::ERBHandler.new
       @config[:handlers] = [
@@ -44,6 +54,7 @@ class Knjappserver
       ]
     end
     
+    @debug = @config[:debug]
     @paused = 0
     @paused_mutex = Mutex.new
     @should_restart = false
@@ -71,7 +82,7 @@ class Knjappserver
         "#{@path_knjappserver}/class_customio.rb"
       ]
       
-      print "Auto restarting.\n" if @config[:debug]
+      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
@@ -79,6 +90,8 @@ class Knjappserver
       end
     end
     
+    
+    #Set up default file-types and merge given filetypes into it.
     @types = {
       :ico => "image/x-icon",
       :jpeg => "image/jpeg",
@@ -95,6 +108,8 @@ class Knjappserver
     @types = @types.merge(@config[:filetypes]) if @config.has_key?(:filetypes)
     
     
+    
+    #Load various required files from knjrbfw and stuff in the knjappserver-framework.
     files = [
       "#{@path_knjrbfw}knjrbfw.rb",
       "#{@path_knjrbfw}knj/arrayext.rb",
@@ -115,28 +130,46 @@ class Knjappserver
       "#{@path_knjappserver}/class_httpresp.rb",
       "#{@path_knjappserver}/class_httpserver.rb",
       "#{@path_knjappserver}/class_httpsession.rb",
+      "#{@path_knjappserver}/class_httpsession_contentgroup.rb",
       "#{@path_knjappserver}/class_session.rb",
       "#{@path_knjappserver}/class_log.rb",
       "#{@path_knjappserver}/class_log_access.rb",
       "#{@path_knjappserver}/class_log_data_value.rb"
     ]
+    files << "#{@path_knjrbfw}knj/gettext_threadded.rb" if @config[:locales_root]
     files.each do |file|
-      STDOUT.print "Loading: '#{file}'.\n" if @config[:debug]
+      STDOUT.print "Loading: '#{file}'.\n" if @debug
       self.loadfile(file)
     end
     
     
-    print "Setting up database.\n" if @config[:debug]
+    print "Setting up database.\n" if @debug
     if @config[:db].is_a?(Knj::Db)
       @db = @config[:db]
     elsif @config[:db].is_a?(Hash)
       @db = Knj::Db.new(@config[:db])
+    elsif !@config[:db] and @config[:db_args]
+      @db = Knj::Db.new(@config[:db_args])
     else
       raise "Unknown object given as db: '#{@config[:db].class.name}'."
     end
     
     
-    print "Starting objects.\n" if @config[:debug]
+    print "Updating database.\n" if @debug
+    require "rubygems" if !@config.key?(:knjdbrevision_path)
+    require "#{@config[:knjdbrevision_path]}knjdbrevision"
+    
+    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 !DATABASE_SCHEMA
+    
+    dbpath = "#{File.dirname(__FILE__)}/../files/database.sqlite3"
+    dbrev = Knjdbrevision.new
+    dbrev.init_db(DATABASE_SCHEMA, @db)
+    
+    
+    print "Spawning objects.\n" if @debug
     @ob = Knj::Objects.new(
       :db => db,
       :class_path => @path_knjappserver,
@@ -157,8 +190,10 @@ class Knjappserver
     
     
     #Start the Knj::Gettext_threadded- and Knj::Translations modules for translations.
-    print "Loading Gettext and translations.\n" if @config[:debug]
+    print "Loading Gettext and translations.\n" if @debug
     @translations = Knj::Translations.new(:db => @db)
+    @ob.requireclass(:Translation, {:require => false, :class => Knj::Translations::Translation})
+    
     if @config[:locales_root]
       @gettext = Knj::Gettext_threadded.new("dir" => config[:locales_root])
     end
@@ -168,32 +203,40 @@ class Knjappserver
     end
     
     if @config[:magic_methods] or !@config.has_key?(:magic_methods)
-      print "Loading magic-methods.\n" if @config[:debug]
+      print "Loading magic-methods.\n" if @debug
       require "#{@path_knjappserver}/magic_methods"
     end
     
     if @config[:customio] or !@config.has_key?(:customio)
-      print "Loading custom-io.\n" if @config[:debug]
-      require "#{@path_knjappserver}/class_customio.rb"
-      cio = Knjappserver::CustomIO.new
-      $stdout = cio
+      print "Loading custom-io.\n" if @debug
+      
+      if $stdout.class.name != "Knjappserver::CustomIO"
+        require "#{@path_knjappserver}/class_customio.rb"
+        cio = Knjappserver::CustomIO.new
+        $stdout = cio
+      end
     end
     
     
     #Save the PID to the run-file.
-    print "Setting run-file.\n" if @config[:debug]
+    print "Setting run-file.\n" if @debug
     require "tmpdir"
     tmpdir = "#{Dir.tmpdir}/knjappserver"
     tmppath = "#{tmpdir}/run_#{@config[:title]}"
     
-    Dir.mkdir(tmpdir) if !File.exists?(tmpdir)
+    if !File.exists?(tmpdir)
+      Dir.mkdir(tmpdir)
+      File.chmod(0777, tmpdir)
+    end
+    
     File.open(tmppath, "w") do |fp|
       fp.write(Process.pid)
     end
+    File.chmod(0777, tmppath)
     
     
     #Set up various events for the appserver.
-    print "Loading events.\n" if @config[:debug]
+    print "Loading events.\n" if @debug
     @events = Knj::Event_handler.new
     @events.add_event(
       :name => :check_page_access,
@@ -203,7 +246,10 @@ class Knjappserver
       :name => :ob,
       :connections_max => 1
     )
-    
+    @events.add_event(
+      :name => :trans_no_str,
+      :connections_max => 1
+    )
     
     #Set up the 'vars'-variable that can be used to set custom global variables for web-requests.
     @vars = Knj::Hash_methods.new
@@ -211,24 +257,30 @@ class Knjappserver
     
     
     #Initialize the various feature-modules.
-    print "Init threadding.\n" if @config[:debug]
+    print "Init sessions.\n" if @debug
+    initialize_sessions
+    
+    print "Init threadding.\n" if @debug
     initialize_threadding
     
-    print "Init mailing.\n" if @config[:debug]
+    print "Init mailing.\n" if @debug
     initialize_mailing
     
-    print "Init errors.\n" if @config[:debug]
+    print "Init errors.\n" if @debug
     initialize_errors
     
-    print "Init logging.\n" if @config[:debug]
+    print "Init logging.\n" if @debug
     initialize_logging
     
-    print "Init cleaner.\n" if @config[:debug]
+    print "Init cleaner.\n" if @debug
     initialize_cleaner
     
+    print "Init cmdline.\n" if @debug
+    initialize_cmdline
+    
     
     #Start the appserver.
-    print "Spawning appserver.\n" if @config[:debug]
+    print "Spawning appserver.\n" if @debug
     @httpserv = Knjappserver::Httpserver.new(self)
     
     
@@ -238,9 +290,10 @@ class Knjappserver
     end
     
     
-    print "Appserver spawned.\n" if @config[:debug]
+    print "Appserver spawned.\n" if @debug
   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]
       require fpath
@@ -259,54 +312,39 @@ class Knjappserver
     return false
   end
   
+  #Starts the HTTP-server and threadpool.
   def start
-    print "Starting appserver.\n" if @config[:debug]
+    STDOUT.print "Starting appserver.\n" if @debug
     Thread.current[:knjappserver] = {:kas => self} if !Thread.current[:knjappserver]
     
     if @config[:autoload]
-      print "Autoloading #{@config[:autoload]}\n" if @config[:debug]
+      STDOUT.print "Autoloading #{@config[:autoload]}\n" if @debug
       require @config[:autoload]
     end
     
     begin
       @threadpool.start if @threadpool
-      print "Threadpool startet.\n" if @config[:debug]
+      STDOUT.print "Threadpool startet.\n" if @debug
       @httpserv.start
-      print "Appserver startet.\n" if @config[:debug]
+      STDOUT.print "Appserver startet.\n" if @debug
     rescue Interrupt
-      print "Got interrupt - stopping appserver.\n" if @config[:debug]
-      stop
+      STDOUT.print "Got interrupt - stopping appserver.\n" if @debug
+      self.stop
     end
   end
   
+  #Stops the entire app and releases join.
   def stop
     proc_stop = proc{
-      print "Stopping appserver for real.\n" if @config[:debug]
+      #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.sessions_flush
+      
+      STDOUT.print "Stopping appserver for real.\n" if @debug
       @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
       
-      print "Stopping threadpool.\n" if @config[:debug]
+      STDOUT.print "Stopping threadpool.\n" if @debug
       @threadpool.stop if @threadpool
-      
-      print "Cleaning out loaded sessions.\n" if @config[:debug]
-      if @sessions
-        @sessions.each do |ip, ip_sessions|
-          ip_sessions.each do |session_hash, session_data|
-            session_data[:dbobj].flush
-            @ob.unset(session_data[:dbobj])
-            session_data[:hash].clear
-            ip_sessions.delete(session_hash)
-            session_data.clear
-          end
-        end
-        @sessions.clear
-      end
-      
-      print "Stopping databases.\n" if @config[:debug]
-      @db.destroy if @db.is_a?(Knj::Threadhandler)
-      @db.close if @db.is_a?(Knj::Db)
-      
-      @db_handler.destroy if @db.is_a?(Knj::Threadhandler)
-      @db_handler.close if @db_handler.is_a?(Knj::Db)
     }
     
     #If we cant get a paused-execution in 10 secs - we just force the stop.
@@ -316,46 +354,43 @@ class Knjappserver
           proc_stop.call
         end
       end
-    rescue Timeout::Error
+    rescue Timeout::Error, SystemExit, Interrupt
+      STDOUT.print "Forcing stop-appserver - couldnt get timing window.\n" if @debug
       proc_stop.call
     end
   end
   
-  # Stop running any more http requests - make them wait.
+  #Stop running any more HTTP-requests - make them wait.
   def pause
     @paused += 1
   end
   
+  #Unpause - start handeling HTTP-requests again.
   def unpause
     @paused -= 1
   end
   
+  #Returns true if paued - otherwise false.
   def paused?
     return true if @paused > 0
     return false
   end
   
+  #Will stop handeling any more HTTP-requests, run the proc given and return handeling HTTP-requests.
   def paused_exec
     self.pause
     
     begin
-      loop do
-        if @httpserv.working_count > 0
-          sleep 0.2
-          next
-        end
-        
-        @paused_mutex.synchronize do
-          yield
-        end
-        
-        break
+      sleep 0.2 while @httpserv and @httpserv.working_count and @httpserv.working_count > 0
+      @paused_mutex.synchronize do
+        yield
       end
     ensure
       self.unpause
     end
   end
   
+  #Returns true if a HTTP-request is working. Otherwise false.
   def working?
     return true if @httpserv and @httpserv.working_count > 0
     return false
@@ -366,76 +401,15 @@ class Knjappserver
     return Thread.current[:knjappserver]
   end
   
-  def session_fromid(args)
-    ip = args[:ip].to_s
-    idhash = args[:idhash].to_s
-    ip = "bot" if idhash == "bot"
-    
-    @sessions[ip] = {} if !@sessions.has_key?(ip)
-    
-    if !@sessions[ip].has_key?(idhash)
-      session = @ob.get_by(:Session, {"idhash" => args[:idhash]})
-      if !session
-        session = @ob.add(:Session, {
-          :idhash => idhash,
-          :ip => ip
-        })
-      end
-      
-      @sessions[ip][idhash] = {
-        :dbobj => session,
-        :hash => {}
-      }
-    end
-    
-    @sessions[ip][idhash][:time_lastused] = Time.now
-    return @sessions[ip][idhash]
-  end
-  
-  def trans(obj, key)
-    args = {}
-    args[:locale] = _session[:locale] if _session[:locale] and !args[:locale]
-    args[:locale] = _httpsession.data[:locale] if _httpsession.data[:locale] and !args[:locale]
-    @translations.get(obj, key, args)
-  end
-  
-  def trans_set(obj, values)
-    args = {}
-    args[:locale] = _session[:locale] if _session[:locale] and !args[:locale]
-    args[:locale] = _httpsession.data[:locale] if _httpsession.data[:locale] and !args[:locale]
-    @translations.set(obj, values, args)
-  end
-  
-  def trans_del(obj)
-    @translations.delete(obj)
-  end
-  
-  def import(filepath)
-    _httpsession.eruby.import(filepath)
-  end
-  
-  def update_db
-    require "rubygems"
-    require "#{@config[:knjdbrevision_path]}knjdbrevision"
-    
-    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 !$tables
-    
-    dbpath = "#{File.dirname(__FILE__)}/../files/database.sqlite3"
-    dbrev = Knjdbrevision.new
-    dbrev.init_db($tables, @db)
-  end
-  
+  #Sleeps until the server is stopped.
   def join
     raise "No http-server or http-server not running." if !@httpserv or !@httpserv.thread_accept
     
     begin
       @httpserv.thread_accept.join
-      @httpserv.thread_restart.join
+      @httpserv.thread_restart.join if @httpserv and @httpserv.thread_restart
     rescue Interrupt
-      stop
+      self.stop
     end
     
     if @should_restart
@@ -450,6 +424,7 @@ class Knjappserver
     end
   end
   
+  #Defines a variable as a method bound to the threads spawned by this instance of Knjappserver.
   def define_magic_var(method_name, var)
     @magic_vars[method_name] = var