knjappserver 0.0.16 → 0.0.17

data/lib/include/class_knjappserver_cleaner.rb

@@ -7,85 +7,90 @@ class Knjappserver
     end
     
     #This should not be runned via _kas.timeout because timeout wont run when @should_restart is true! - knj
-    Knj::Thread.new do
-      loop do
-        sleep time
-        
-        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]
+    Thread.new do
+        begin
+        loop do
+          sleep time
           
-          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
-        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
+          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]
             
-            #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.
+            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
+          end
+          
+          if @should_restart and !@should_restart_done and !@should_restart_runnning
             begin
-              Timeout.timeout(30) do
-                loop do
-                  working_count = self.httpserv.working_count
-                  working = false
-                  
-                  if 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
+              @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"
                   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
-            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 = Knj::Php.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)}")
+              #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
+              
+              STDOUT.print "Restarting knjAppServer with command: #{mycmd}\n"
+              @should_restart_done = true
+              print exec(mycmd)
+              exit
+            rescue Exception => e
+              STDOUT.puts e.inspect
+              STDOUT.puts e.backtrace
             end
-            
-            STDOUT.print "Restarting knjAppServer with command: #{mycmd}\n"
-            @should_restart_done = true
-            print exec(mycmd)
-            exit
-          rescue Exception => e
-            STDOUT.puts e.inspect
-            STDOUT.puts e.backtrace
           end
         end
+      rescue => e
+        self.handle_error(e)
       end
     end
     
+    #This flushes (writes) all session-data to the server and deletes old unused sessions from the database.
     self.timeout(:time => 300) do
       STDOUT.print "Cleaning sessions on appserver.\n" if @config[:debug]
       
@@ -106,9 +111,10 @@ class Knjappserver
         
         STDOUT.print "Delete sessions...\n" if @config[:debug]
         @ob.list(:Session, {"id_not" => session_not_ids, "date_lastused_below" => (Time.now - 5356800)}) do |session|
+          idhash = session[:idhash]
+          STDOUT.print "Deleting session: '#{session.id}'.\n" if @config[:debug]
           @ob.delete(session)
-          @sessions.delete(session[:idhash])
-          STDOUT.print "Deleted session: #{session.id}\n" if @config[:debug]
+          @sessions.delete(idhash)
         end
       end
     end

data/lib/include/class_knjappserver_cmdline.rb

@@ -2,27 +2,32 @@ class Knjappserver
   def initialize_cmdline
     @cmds = {}
     
-    Knj::Thread.new do
-      line = $stdin.gets
-      
-      called = 0
-      @cmds.each do |key, connects|
-        data = {}
+    Thread.new do
+      begin
+        line = $stdin.gets
+        next if line == "\n"
         
-        if key.is_a?(Regexp)
-          if line.match(key)
-            connects.each do |conn|
-              called += 1
-              conn[:block].call(data)
+        called = 0
+        @cmds.each do |key, connects|
+          data = {}
+          
+          if key.is_a?(Regexp)
+            if line.match(key)
+              connects.each do |conn|
+                called += 1
+                conn[:block].call(data)
+              end
             end
+          else
+            raise "Unknown class for 'cmd_connect': '#{key.class.name}'."
           end
-        else
-          raise "Unknown class for 'cmd_connect': '#{key.class.name}'."
         end
-      end
-      
-      if called == 0
-        print "Unknown command: '#{line.strip}'.\n"
+        
+        if called == 0
+          print "Unknown command: '#{line.strip}'.\n"
+        end
+      rescue => e
+        self.handle_error(e)
       end
     end
     
@@ -32,6 +37,7 @@ class Knjappserver
     end
     
     self.cmd_connect(/^\s*stop\s*$/i) do |data|
+      print "Stopping appserver.\n"
       self.stop
     end
   end

data/lib/include/class_knjappserver_errors.rb

@@ -1,120 +1,137 @@
 class Knjappserver
   attr_reader :error_emails_pending
   
-	def initialize_errors
-		@error_emails_pending = {}
-		@error_emails_pending_mutex = Mutex.new
-		
-		if @config[:error_emails_time]
+  def initialize_errors
+    @error_emails_pending = {}
+    @error_emails_pending_mutex = Mutex.new
+    
+    if @config[:error_emails_time]
       @error_emails_time = @config[:error_emails_time]
     elsif @config[:debug]
       @error_emails_time = 5
     else
       @error_emails_time = 180
     end
-		
-		self.timeout(:time => @error_emails_time) do
-			self.flush_error_emails
-		end
-	end
-	
-	#Send error-emails based on error-emails-cache (cached so the same error isnt send out every time it occurrs to prevent spamming).
-	def flush_error_emails
-		@error_emails_pending_mutex.synchronize do
-			send_time_older_than = Time.new.to_i - @error_emails_time
-			
-			@error_emails_pending.each do |backtrace_hash, error_email|
-				if send_time_older_than < error_email[:last_time].to_i and error_email[:messages].length < 1000
-					next
-				end
-				
-				@config[:error_report_emails].each do |email|
-          next if !email
+    
+    self.timeout(:time => @error_emails_time) do
+      self.flush_error_emails
+    end
+  end
+  
+  #Send error-emails based on error-emails-cache (cached so the same error isnt send out every time it occurrs to prevent spamming).
+  def flush_error_emails
+    @error_emails_pending_mutex.synchronize do
+      send_time_older_than = Time.new.to_i - @error_emails_time
+      
+      @error_emails_pending.each do |backtrace_hash, error_email|
+        if send_time_older_than < error_email[:last_time].to_i and error_email[:messages].length < 1000
+          next
+        end
+        
+        @config[:error_report_emails].each do |email|
+          next if !email or error_email[:messages].length <= 0
+          
+          if error_email[:messages].length == 1
+            html = error_email[:messages].first
+          else
+            html = "<b>First time:</b> #{Knj::Datet.in(error_email[:first_time]).out}<br />"
+            html << "<b>Last time:</b> #{Knj::Datet.in(error_email[:last_time]).out}<br />"
+            html << "<b>Number of errors:</b> #{error_email[:messages].length}<br />"
+            count = 0
+            
+            error_email[:messages].each do |error_msg|
+              count += 1
+              
+              if count > 10
+                html << "<br /><br /><b><i>Limiting to showing 10 out of #{error_email[:messages].length} messages.</i></b>"
+                break
+              end
+              
+              html << "<br /><br />"
+              html << "<b>Message #{count}</b><br />"
+              html << error_msg
+            end
+          end
           
-					if error_email[:messages].length == 1
-						html = error_email[:messages].first
-					else
-						html = "<b>First time:</b> #{Knj::Datet.in(error_email[:first_time]).out}<br />"
-						html += "<b>Last time:</b> #{Knj::Datet.in(error_email[:last_time]).out}<br />"
-						html += "<b>Number of errors:</b> #{error_email[:messages].length}<br />"
-						count = 0
-						
-						error_email[:messages].each do |error_msg|
-							count += 1
-							
-							if count > 10
-								html += "<br /><br /><b><i>Limiting to showing 10 out of #{error_email[:messages].length} messages.</i></b>"
-								break
-							end
-							
-							html += "<br /><br />"
-							html += "<b>Message #{count}</b><br />"
-							html += error_msg
-						end
-					end
-					
-					self.mail(
-						:to => email,
-						:subject => error_email[:subject],
-						:html => html,
-						:from => @config[:error_report_from]
-					)
-				end
-				
-				@error_emails_pending.delete(backtrace_hash)
-			end
-		end
-	end
-	
-	#Handels a given error. Sends to the admin-emails.
-	def handle_error(e, args = {})
-		@error_emails_pending_mutex.synchronize do
-			if !Thread.current[:knjappserver] or !Thread.current[:knjappserver][:httpsession]
-				STDOUT.print "Error: "
-				STDOUT.puts e.inspect
-				STDOUT.print "\n"
-				STDOUT.puts e.backtrace
-				STDOUT.print "\n\n"
-			end
-			
-			if @config.has_key?(:smtp_args) and @config[:error_report_emails] and (!args.has_key?(:email) or args[:email])
-				backtrace_hash = Knj::ArrayExt.array_hash(e.backtrace)
-				
-				if !@error_emails_pending.has_key?(backtrace_hash)
-					@error_emails_pending[backtrace_hash] = {
-						:first_time => Time.new,
-						:messages => [],
-						:subject => sprintf("Error @ %s", @config[:title]) + " (#{Knj::Strings.shorten(e.message, 100)})"
-					}
-				end
-				
-				html = "An error occurred.<br /><br />"
-				html += "<b>#{e.class.name.html}: #{e.message.html}</b><br /><br />"
-				
-				e.backtrace.each do |line|
-					html += line.html + "<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
-				
-				error_hash = @error_emails_pending[backtrace_hash]
-				error_hash[:last_time] = Time.new
-				error_hash[:messages] << html
-			end
-		end
-	end
-	
-	#Takes a proc and executes it. On error it alerts the error-message with javascript to the server, sends a javascript back and exits.
-	def on_error_go_back(&block)
+          self.mail(
+            :to => email,
+            :subject => error_email[:subject],
+            :html => html,
+            :from => @config[:error_report_from]
+          )
+        end
+        
+        @error_emails_pending.delete(backtrace_hash)
+      end
+    end
+  end
+  
+  #Handels a given error. Sends to the admin-emails.
+  def handle_error(e, args = {})
+    @error_emails_pending_mutex.synchronize do
+      if !Thread.current[:knjappserver] or !Thread.current[:knjappserver][:httpsession]
+        STDOUT.print "#{Knj::Errors.error_str(e)}\n\n"
+      end
+      
+      browser = _httpsession.browser if _httpsession
+      
+      send_email = true
+      send_email = false if !@config[:smtp_args]
+      send_email = false if !@config[:error_report_emails]
+      send_email = false if args.has_key?(:email) and !args[:email]
+      send_email = false if @config.key?(:error_report_bots) and !@config[:error_report_bots] and browser and browser["browser"] == "bot"
+      
+      if send_email
+        backtrace_hash = Knj::ArrayExt.array_hash(e.backtrace)
+        
+        if !@error_emails_pending.has_key?(backtrace_hash)
+          @error_emails_pending[backtrace_hash] = {
+            :first_time => Time.new,
+            :messages => [],
+            :subject => sprintf("Error @ %s", @config[:title]) + " (#{Knj::Strings.shorten(e.message, 100)})"
+          }
+        end
+        
+        html = "An error occurred.<br /><br />"
+        html << "<b>#{e.class.name.html}: #{e.message.html}</b><br /><br />"
+        
+        e.backtrace.each do |line|
+          html << line.html + "<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
+        
+        error_hash = @error_emails_pending[backtrace_hash]
+        error_hash[:last_time] = Time.new
+        error_hash[:messages] << html
+      end
+    end
+  end
+  
+  #Takes a proc and executes it. On error it alerts the error-message with javascript to the server, sends a javascript back and exits.
+  def on_error_go_back(&block)
     begin
       block.call
     rescue => e
       self.alert(e.message).back
     end
-	end
+  end
+  
+  #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)
+  end
+  
+  #Prints a string with a single file-line-backtrace prepended which is useful for debugging.
+  def debugs(str)
+    #Get backtrace.
+    backtrace_str = caller[0]
+    backtrace_match = backtrace_str.match(/^(.+):(\d+):in /)
+    STDOUT.print "#{File.basename(backtrace_match[1])}:#{backtrace_match[2]}: #{str}\n"
+  end
 end