knjappserver 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-22}
+  s.date = %q{2012-06-10}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]

data/lib/include/class_httpserver.rb

@@ -42,39 +42,12 @@ class Knjappserver::Httpserver
         STDOUT.print Knj::Errors.error_str(e)
       end
 		end
-		
-		@thread_restart = Thread.new do
-      begin
-        loop do
-          sleep 10
-          break if @kas.should_restart and @kas.should_restart_done
-          
-          if !@kas.should_restart and (!@server or @server.closed?)
-            STDOUT.print "Socket does not exist or is closed - restarting HTTP-server!\n"
-            @server = TCPServer.new(@kas.config[:host], @kas.config[:port])
-            STDOUT.print "Done.\n"
-          end
-        end
-      rescue => e
-        if @kas
-          @kas.handle_error(e)
-        else
-          STDOUT.print Knj::Errors.error_str(e)
-        end
-      end
-    end
 	end
 	
 	def stop
-    begin
-      STDOUT.print "Stopping accept-thread.\n" if @debug
-      @thread_accept.kill if @thread_accept and @thread_accept.alive?
-      @thread_restart.kill if @thread_restart and @thread_restart.alive?
-    rescue => e
-      STDOUT.print "Could not stop threads.\n" if @debug
-      STDOUT.puts e.inspect
-      STDOUT.puts e.backtrace
-    end
+    STDOUT.print "Stopping accept-thread.\n" if @debug
+    @thread_accept.kill if @thread_accept and @thread_accept.alive?
+    @thread_restart.kill if @thread_restart and @thread_restart.alive?
     
     STDOUT.print "Stopping all HTTP sessions.\n" if @debug
     if @http_sessions

data/lib/include/class_httpsession.rb

@@ -1,14 +1,13 @@
+#This class handels the HTTP-sessions.
 class Knjappserver::Httpsession
   attr_accessor :data, :alert_sent
   attr_reader :cookie, :get, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
   
-  dir = File.dirname(__FILE__)
-  
-  autoload :Contentgroup, "#{dir}/class_httpsession_contentgroup.rb"
-  autoload :Http_request, "#{dir}/class_httpsession_http_request.rb"
-  autoload :Http_response, "#{dir}/class_httpsession_http_response.rb"
-  autoload :Page_environment, "#{dir}/class_httpsession_page_environment.rb"
-  autoload :Post_multipart, "#{dir}/class_httpsession_post_multipart.rb"
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.dirname(__FILE__)}/class_httpsession_#{name.to_s.downcase}.rb"
+    return Knjappserver::Httpsession.const_get(name.to_s.to_sym)
+  end
   
   def initialize(httpserver, socket)
     @data = {}

data/lib/include/class_knjappserver.rb

@@ -2,10 +2,11 @@ class Knjappserver
   attr_reader :cio, :config, :httpserv, :debug, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_procs, :magic_vars, :types, :eruby_cache, :httpsessions_ids
   attr_accessor :served, :should_restart, :should_restart_done
   
-  appsrv_dir = File.dirname(__FILE__)
-  autoload :ERBHandler, "#{appsrv_dir}/class_erbhandler"
-  autoload :Log, "#{appsrv_dir}/class_log.rb"
-  autoload :Log_link, "#{appsrv_dir}/class_log_link.rb"
+  #Autoloader for subclasses.
+  def self.const_missing(name)
+    require "#{File.dirname(__FILE__)}/class_#{name.to_s.downcase}.rb"
+    return Knjappserver.const_get(name)
+  end
   
   def initialize(config)
     raise "No arguments given." if !config.is_a?(Hash)
@@ -374,13 +375,17 @@ class Knjappserver
     rescue Interrupt => e
       STDOUT.print "Got interrupt - trying to stop appserver.\n" if @debug
       self.stop
+      raise e
     end
   end
   
   #Stops the entire app and releases join.
   def stop
+    return nil if @stop_called
+    @stop_called = true
+    
     proc_stop = proc{
-      STDOUT.print "Stopping appserver for real.\n" if @debug
+      STDOUT.print "Stopping appserver.\n" if @debug
       @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
       
       STDOUT.print "Stopping threadpool.\n" if @debug
@@ -389,6 +394,8 @@ class Knjappserver
       #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 done...\n" if @debug
     }
     
     #If we cant get a paused-execution in 5 secs - we just force the stop.
@@ -453,7 +460,7 @@ class Knjappserver
     begin
       @httpserv.thread_accept.join
       @httpserv.thread_restart.join if @httpserv and @httpserv.thread_restart
-    rescue Interrupt
+    rescue Interrupt => e
       self.stop
     end
     

data/lib/include/class_knjappserver_cleaner.rb

@@ -79,7 +79,7 @@ class Knjappserver
               @should_restart_done = true
               print exec(mycmd)
               exit
-            rescue Exception => e
+            rescue => e
               STDOUT.puts e.inspect
               STDOUT.puts e.backtrace
             end

data/lib/include/class_knjappserver_cmdline.rb

@@ -4,27 +4,26 @@ class Knjappserver
     
     Thread.new do
       begin
-        line = $stdin.gets
-        next if line == "\n"
-        
-        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)
+        $stdin.each_line do |line|
+          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
         end
       rescue => e
         self.handle_error(e)

data/lib/include/class_knjappserver_mailing.rb

@@ -8,7 +8,8 @@ class Knjappserver
 		@mails_waiting = []
 		@mails_mutex = Monitor.new
 		@mails_queue_mutex = Monitor.new
-		@mails_timeout = self.timeout(:time => 10) do
+		@mails_timeout = self.timeout(:time => 30) do
+      STDOUT.print "Flushing mails.\n" if @debug
 			self.mail_flush
 		end
 	end
@@ -30,8 +31,8 @@ class Knjappserver
 			
 			mailobj = Knjappserver::Mail.new({:kas => self, :errors => {}, :status => :waiting}.merge(mail_args))
 			STDOUT.print "Added mail '#{mailobj.__id__}' to the mail-send-queue.\n" if debug
-			@mails_waiting << mailobj if mail_args[:now]
-			self.mail_flush
+			@mails_waiting << mailobj
+			self.mail_flush if mail_args[:now]
 			return mailobj
 		end
 	end
@@ -39,8 +40,12 @@ 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
+      if @mails_waiting.length <= 0
+        STDOUT.print "No mails to flush - skipping.\n" if @debug
+        return false
+      end
       
+      STDOUT.print "Trying to ping Google to figure out if we are online...\n" if @debug
       status = Ping.pingecho("google.dk", 10, 80)
       if !status
         STDOUT.print "We are not online - skipping mail flush.\n"
@@ -49,6 +54,7 @@ class Knjappserver
       
       begin
         #Use subprocessing to avoid the mail-framework (activesupport and so on, also possible memory leaks in those large frameworks).
+        STDOUT.print "Starting subprocess for mailing.\n" if @debug
         require "knj/process_meta"
         subproc = Knj::Process_meta.new("debug" => @debug, "debug_err" => true, "id" => "knjappserver_mailing")
         subproc.static("Object", "require", "rubygems")
@@ -130,7 +136,7 @@ class Knjappserver
       @args[:status] = :sent
       STDOUT.print "Sent email #{self.__id__}\n" if @args[:kas].debug
       return true
-    rescue Exception => e
+    rescue => e
       if @args[:kas].debug
         STDOUT.print "Could not send email.\n"
         STDOUT.puts e.inspect

data/lib/include/class_knjappserver_threadding.rb

@@ -39,13 +39,18 @@ class Knjappserver
       begin
         thread_obj.args[:running] = true
         yield(*args[:args])
-      rescue Exception => e
-        handle_error(e)
+      rescue => e
+        self.handle_error(e)
         thread_obj.args[:error] = true
         thread_obj.args[:error_obj] = e
       ensure
+        STDOUT.print "Free thread ob-db.\n" if @debug
         @ob.db.free_thread if @ob.db.opts[:threadsafe]
+        
+        STDOUT.print "Free thread db-handler.\n" if @debug
         @db_handler.free_thread if @db_handler.opts[:threadsafe]
+        
+        STDOUT.print "Set args on thread.\n" if @debug
         thread_obj.args[:running] = false
         thread_obj.args[:done] = true
       end

data/lib/include/class_knjappserver_threadding_timeout.rb

@@ -64,7 +64,7 @@ class Knjappserver::Threadding_timeout
               end
             end
           end
-        rescue Exception => e
+        rescue => e
           @kas.handle_error(e)
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: knjappserver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 +02:00
+date: 2012-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4394912517920739657
+      hash: -2439640920706539794
       segments: 
       - 0
       version: "0"