knjappserver 0.0.16 → 0.0.17

data/lib/include/class_knjappserver_leakproxy_client.rb

@@ -0,0 +1,6 @@
+#This is the part of Leakproxy that actually starts the copy of the Knjappserver.
+class Knjappserver::Leakproxy_client
+  def initialize(args = {})
+    
+  end
+end

data/lib/include/class_knjappserver_leakproxy_server.rb

@@ -0,0 +1,56 @@
+#This class starts a Knjappserver in another process. This process can be used for scripts that leak memory. The memoy-usage is
+#looked over and the process restarted when it reaches a certain point. Doing the restart all waiting requests will wait gracefully.
+class Knjappserver::Leakproxy_server
+  def initialize(args)
+    require "#{$knjpath}/process"
+    
+    leakproxy_path = "#{File.dirname(__FILE__)}/../scripts/leakproxy.rb"
+    executable = Knj::Os.executed_executable
+    
+    @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(executable, leakproxy_path, "r+")
+    @kas = args[:kas]
+    @config = @kas.config
+    
+    Thread.new do
+      STDOUT.print "Doing loop:\n"
+      @stderr.each_line do |str|
+        STDOUT.print "Test: #{str}"
+      end
+    end
+    
+    pass_conf = {}
+    pass_conf_keys = [:knjrbfw_path]
+    pass_conf_keys.each do |key, val|
+      pass_conf[key] = val if @config.key?(key)
+    end
+    
+    args_pass = {
+      :config => pass_conf
+    }
+    
+    @stdin.write("#{Marshal.dump(args_pass)}\n")
+    
+    @process = Knj::Process.new(
+      :out => @stdin,
+      :in => @stdout,
+      :err => @stderr,
+      :listen => true,
+      :debug => true,
+      :on_rec => proc{|d|
+        obj = d.obj
+        
+        if obj.is_a?(Hash)
+          if obj["type"] == "print"
+            STDOUT.print obj["str"]
+          end
+        else
+          STDOUT.print Knj::Php.print_r(obj, true)
+        end
+      }
+    )
+  end
+  
+  def spawn
+    
+  end
+end

data/lib/include/class_knjappserver_logging.rb

@@ -259,17 +259,17 @@ class Knjappserver
 		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 += "<thead>"
-		html += "<tr>"
-		html += "<th>ID</th>"
-		html += "<th>Message</th>"
-		html += "<th style=\"width: 130px;\">Date &amp; time</th>"
-		html += "<th>Tag</th>"
-		html += "<th>Objects</th>" if args[:ob_use]
-		html += "<th>IP</th>" if args[:show_ip]
-		html += "</tr>"
-		html += "</thead>"
-		html += "<tbody>"
+		html << "<thead>"
+		html << "<tr>"
+		html << "<th>ID</th>"
+		html << "<th>Message</th>"
+		html << "<th style=\"width: 130px;\">Date &amp; time</th>"
+		html << "<th>Tag</th>"
+		html << "<th>Objects</th>" if args[:ob_use]
+		html << "<th>IP</th>" if args[:show_ip]
+		html << "</tr>"
+		html << "</thead>"
+		html << "<tbody>"
 		
 		links.each do |link|
       log = link.log
@@ -280,32 +280,32 @@ class Knjappserver
 			classes = ["knjappserver_log", "knjappserver_log_#{log.id}"]
 			classes << "knjappserver_log_multiple_lines" if msg_lines.length > 1
 			
-			html += "<tr class=\"#{classes.join(" ")}\">"
-			html += "<td>#{log.id}</td>"
-			html += "<td>#{first_line.html}</td>"
-			html += "<td>#{log.date_saved_str}</td>"
-			html += "<td>#{log.tag.html}</td>"
+			html << "<tr class=\"#{classes.join(" ")}\">"
+			html << "<td>#{log.id}</td>"
+			html << "<td>#{first_line.html}</td>"
+			html << "<td>#{log.date_saved_str}</td>"
+			html << "<td>#{log.tag.html}</td>"
 			
 			if args[:ob_use]
         begin
-          html += "<td>#{log.objects_html(args[:ob_use])}</td>"
+          html << "<td>#{log.objects_html(args[:ob_use])}</td>"
         rescue => e
-          html += "<td>#{e.message.html}</td>"
+          html << "<td>#{e.message.html}</td>"
         end
       end
       
-			html += "<td>#{log.ip}</td>" if args[:show_ip]
-			html += "</tr>"
+			html << "<td>#{log.ip}</td>" if args[:show_ip]
+			html << "</tr>"
 		end
 		
 		if links.empty?
-			html += "<tr>"
-			html += "<td colspan=\"2\" class=\"error\">No logs were found for that object.</td>"
-			html += "</tr>"
+			html << "<tr>"
+			html << "<td colspan=\"2\" class=\"error\">No logs were found for that object.</td>"
+			html << "</tr>"
 		end
 		
-		html += "</tbody>"
-		html += "</table>"
+		html << "</tbody>"
+		html << "</table>"
 		
 		return html
 	end

data/lib/include/class_knjappserver_mailing.rb

@@ -2,8 +2,7 @@ class Knjappserver
   attr_reader :mails_waiting
   
 	def initialize_mailing
-    STDOUT.print "Loading mail.\n" if @config[:debug]
-    require "mail" if !@config.has_key?(:mail_require) or @config[:mail_require]
+    require "knj/autoload/ping"
     
 		@mails_waiting = []
 		@mails_mutex = Mutex.new
@@ -15,6 +14,8 @@ class Knjappserver
 	
 	#Queue a mail for sending. Possible keys are: :subject, :from, :to, :text and :html.
 	def mail(mail_args)
+    raise "'smtp_args' has not been given for the Knjappserver." if !@config[:smtp_args]
+    
 		@mails_queue_mutex.synchronize do
 			count_wait = 0
 			while @mails_waiting.length > 100
@@ -36,28 +37,44 @@ class Knjappserver
 	#Sends all queued mails to the respective servers, if we are online.
 	def mail_flush
 		@mails_mutex.synchronize do
-			return false if @mails_waiting.length <= 0
-			
-			status = Ping.pingecho("google.dk", 10, 80)
-			if !status
-				STDOUT.print "We are not online - skipping mail flush.\n"
-				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
-			
-			@mails_waiting.each do |mail|
-				begin
-					if mail.send
-						@mails_waiting.delete(mail)
-					end
-				rescue Timeout::Error
-					#ignore - 
-				rescue => e
-					@mails_waiting.delete(mail)
-					self.handle_error(e, {:email => false})
-				end
-				
-				sleep 1 #sleep so we dont take up too much bandwidth.
-			end
+      return false if @mails_waiting.length <= 0
+      
+      status = Ping.pingecho("google.dk", 10, 80)
+      if !status
+        STDOUT.print "We are not online - skipping mail flush.\n"
+        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).
+        require "knj/process_meta"
+        subproc = Knj::Process_meta.new("debug" => @debug, "debug_err" => true)
+        subproc.static("Object", "require", "rubygems")
+        subproc.static("Object", "require", "mail")
+        subproc.static("Object", "require", "#{@config[:knjrbfw_path]}knjrbfw")
+        subproc.static("Object", "require", "knj/autoload")
+        
+        STDOUT.print "Flushing emails." if @debug
+        @mails_waiting.each do |mail|
+          begin
+            STDOUT.print "Sending email: #{mail.__id__}\n" if @debug
+            if mail.send("proc" => subproc)
+              STDOUT.print "Email sent: #{mail.__id__}\n" if @debug
+              @mails_waiting.delete(mail)
+            end
+          rescue Timeout::Error
+            #ignore - 
+          rescue => e
+            @mails_waiting.delete(mail)
+            self.handle_error(e, {:email => false})
+          end
+          
+          sleep 1 #sleep so we dont take up too much bandwidth.
+        end
+      ensure
+        subproc.destroy if subproc
+        subproc = nil
+      end
 		end
 	end
 	
@@ -77,43 +94,54 @@ class Knjappserver
 		end
 		
 		#Sends the email to the receiver.
-		def send
+		def send(args = {})
       STDOUT.print "Sending mail '#{__id__}'.\n" if @args[:kas].debug
       
-      begin
+      if @args[:from]
+        from = @args[:from]
+      elsif @args[:kas].config[:error_report_from]
+        from = @args[:kas].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[:kas].config[:smtp_args])
+        mail._pm_send_noret("to=", @args[:to])
+        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("send")
+      else
+        require "knj/mailobj"
         mail = Knj::Mailobj.new(@args[:kas].config[:smtp_args])
         mail.to = @args[:to]
         mail.subject = @args[:subject] if @args[:subject]
-        mail.html = @args[:html] if @args[:html]
-        mail.text = @args[:text] if @args[:text]
-        
-        if @args[:from]
-          mail.from = @args[:from]
-        elsif @args[:kas].config[:error_report_from]
-          mail.from = @args[:kas].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
-        
-				mail.send
-				@args[:status] = :sent
-				STDOUT.print "Sent email #{self.__id__}\n" if @args[:kas].debug
-				return true
-			rescue Exception => e
-        if @args[:kas].debug
-          STDOUT.print "Could not send email.\n"
-          STDOUT.puts e.inspect
-          STDOUT.puts e.backtrace
-        end
-        
-				@args[:errors][e.class.name] = {:count => 0} if !@args[:errors].has_key?(e.class.name)
-				@args[:errors][e.class.name][:count] += 1
-				raise e if @args[:errors][e.class.name][:count] >= 5
-				@args[:status] = :error
-				@args[:error] = e
-				
-				return false
-			end
+        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.send
+      end
+      
+      @args[:status] = :sent
+      STDOUT.print "Sent email #{self.__id__}\n" if @args[:kas].debug
+      return true
+    rescue Exception => e
+      if @args[:kas].debug
+        STDOUT.print "Could not send email.\n"
+        STDOUT.puts e.inspect
+        STDOUT.puts e.backtrace
+      end
+      
+      @args[:errors][e.class.name] = {:count => 0} if !@args[:errors].has_key?(e.class.name)
+      @args[:errors][e.class.name][:count] += 1
+      raise e if @args[:errors][e.class.name][:count] >= 5
+      @args[:status] = :error
+      @args[:error] = e
+      
+      return false
 		end
 	end
 end

data/lib/include/class_knjappserver_sessions.rb

@@ -4,9 +4,7 @@ class Knjappserver
   end
   
   #Returns or adds session based on idhash and meta-data.
-  def session_fromid(args)
-    ip = args[:ip].to_s
-    idhash = args[:idhash].to_s
+  def session_fromid(ip, idhash, meta)
     ip = "bot" if idhash == "bot"
     
     if !@sessions.key?(idhash)
@@ -14,42 +12,31 @@ class Knjappserver
       if !session
         session = @ob.add(:Session, {
           :idhash => idhash,
-          :user_agent => args[:meta]["HTTP_USER_AGENT"],
+          :user_agent => meta["HTTP_USER_AGENT"],
           :ip => ip
         })
       end
       
+      hash = {}
       @sessions[idhash] = {
         :dbobj => session,
-        :hash => {}
+        :hash => hash
       }
     else
       session = @sessions[idhash][:dbobj]
+      hash = @sessions[idhash][:hash]
     end
     
-=begin
-    if ip != "bot"
-      if session[:user_agent] != args[:meta]["HTTP_USER_AGENT"]
-        STDOUT.print "Invalid user-agent!\n"
-        STDOUT.print Knj::Php.print_r(session, true)
-        
-        raise Knj::Errors::InvalidData, "Invalid user-agent."
-      elsif !session.remember? and ip.to_s != session[:ip].to_s
-        STDOUT.print "Invalid IP!\n"
-        STDOUT.print Knj::Php.print_r(session, true)
-        
-        raise Knj::Errors::InvalidData, "Invalid IP."
-      end
+    if ip != "bot" and !session.remember? and ip.to_s != session[:ip].to_s
+      raise Knj::Errors::InvalidData, "Invalid IP."
     end
-=end
     
     @sessions[idhash][:time_lastused] = Time.now
-    return @sessions[idhash]
+    return [session, hash]
   end
   
   #Generates a new session-ID by the meta data.
-  def session_generate_id(args)
-    meta = args[:meta]
+  def session_generate_id(meta)
     return Digest::MD5.hexdigest("#{Time.now.to_f}_#{meta["HTTP_HOST"]}_#{meta["REMOTE_HOST"]}_#{meta["HTTP_X_FORWARDED_SERVER"]}_#{meta["HTTP_X_FORWARDED_FOR"]}_#{meta["HTTP_X_FORWARDED_HOST"]}_#{meta["REMOTE_ADDR"]}_#{meta["HTTP_USER_AGENT"]}")
   end
   
@@ -75,4 +62,10 @@ class Knjappserver
       end
     end
   end
+  
+  #Writes all session-data and resets the hash.
+  def sessions_reset
+    self.sessions_flush
+    @sessions = {}
+  end
 end

data/lib/include/class_knjappserver_threadding.rb

@@ -1,27 +1,33 @@
 class Knjappserver
-	def initialize_threadding
+  def initialize_threadding
     @config[:threadding] = {} if !@config.has_key?(:threadding)
-    @config[:threadding][:max_running] = 25 if !@config[:threadding].has_key?(:max_running)
+    @config[:threadding][:max_running] = 1 if !@config[:threadding].has_key?(:max_running)
     
-		@threadpool = Knj::Threadpool.new(:threads => @config[:threadding][:max_running])
-		@threadpool.events.connect(:on_error) do |event, error|
-      STDOUT.print "Error!\n"
-			self.handle_error(error)
-		end
-	end
-	
-	#Inits the thread so it has access to the appserver and various magic methods can be used.
-	def thread_init(thread)
+    @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
+  end
+  
+  #Inits the thread so it has access to the appserver and various magic methods can be used.
+  def thread_init(thread = nil)
+    thread = Thread.current if thread == nil
     thread[:knjappserver] = {} if !thread[:knjappserver]
     thread[:knjappserver][:kas] = self
-	end
-	
-	#Spawns a new thread with access to magic methods, _db-method and various other stuff in the appserver.
-	def thread(args = {})
-		raise "No block given." if !block_given?
-		args[:args] = [] if !args[:args]
-		
-		@threadpool.run_async do
+  end
+  
+  #Spawns a new thread with access to magic methods, _db-method and various other stuff in the appserver.
+  def thread(args = {})
+    raise "No block given." if !block_given?
+    args[:args] = [] if !args[:args]
+    
+    thread_obj = Knjappserver::Thread_instance.new(
+      :running => false,
+      :error => false,
+      :done => false
+    )
+    
+    @threadpool.run_async do
       @ob.db.get_and_register_thread if @ob.db.opts[:threadsafe]
       @db_handler.get_and_register_thread if @db_handler.opts[:threadsafe]
       
@@ -30,31 +36,52 @@ class Knjappserver
         :db => @db_handler
       }
       
-			begin
-				yield(*args[:args])
-			rescue Exception => e
-				handle_error(e)
-			ensure
-				@ob.db.free_thread if @ob.db.opts[:threadsafe]
-				@db_handler.free_thread if @db_handler.opts[:threadsafe]
-			end
-		end
-	end
-	
-	#Runs a proc every number of seconds.
-	def timeout(args = {}, &block)
-    to = Knjappserver::Threadding_timeout.new(
+      begin
+        thread_obj.args[:running] = true
+        yield(*args[:args])
+      rescue Exception => e
+        handle_error(e)
+        thread_obj.args[:error] = true
+        thread_obj.args[:error_obj] = e
+      ensure
+        @ob.db.free_thread if @ob.db.opts[:threadsafe]
+        @db_handler.free_thread if @db_handler.opts[:threadsafe]
+        thread_obj.args[:running] = false
+        thread_obj.args[:done] = true
+      end
+    end
+    
+    return thread_obj
+  end
+  
+  #Runs a proc every number of seconds.
+  def timeout(args = {}, &block)
+    return Knjappserver::Threadding_timeout.new({
       :kas => self,
       :block => block,
-      :args => args
-    )
-    to.start
-    
-    return to
-	end
-	
-	#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)
+      :args => []
+    }.merge(args)).start
+  end
+  
+  #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)
-	end
+  end
+end
+
+class Knjappserver::Thread_instance
+  attr_reader :args
+  
+  def initialize(args)
+    @args = args
+  end
+  
+  def join
+    sleep 0.1 while !@args[:done]
+  end
+  
+  def join_error
+    self.join
+    raise @args[:error_obj] if @args[:error_obj]
+  end
 end