knjappserver 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-02-25}
+  s.date = %q{2012-03-04}
   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_httpsession.rb

@@ -69,13 +69,23 @@ class Knjappserver::Httpsession
             @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(1500) do
+            #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 "Paused! (#{@kas.paused}) - sleeping.\n" if @debug
+              STDOUT.print "#{__id__} - Paused! (#{@kas.paused}) - sleeping.\n" if @debug
               sleep 0.1
             end
             
@@ -83,7 +93,7 @@ class Knjappserver::Httpsession
             
             if @config.key?(:max_requests_working)
               while @httpserver and @config and @httpserver.working_count.to_i >= @config[:max_requests_working].to_i
-                STDOUT.print "Maximum amounts of requests are working (#{@httpserver.working_count}, #{@config[:max_requests_working]}) - sleeping.\n" if @debug
+                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
@@ -94,22 +104,26 @@ class Knjappserver::Httpsession
             
             @httpserver.count_add
             @working = true
-            STDOUT.print "Serving.\n" if @debug
-            self.serve
-          ensure
-            @httpserver.count_remove
-            @kas.served += 1 if @kas
-            @working = false
+            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
         end
-      rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE, Timeout::Error => e
-        #Ignore - the user probaly left.
-        #STDOUT.puts e.inspect
-        #STDOUT.puts e.backtrace
+      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 SystemExit, Interrupt => e
         raise e
       rescue Exception => e

data/lib/include/class_httpsession_http_response.rb

@@ -47,10 +47,14 @@ class Knjappserver::Httpsession::Http_response
     
     @headers_11 = {
       "Connection" => "Keep-Alive",
-      "Transfer-Encoding" => "chunked",
-      "Keep-Alive" => "timeout=15, max=30"
+      "Transfer-Encoding" => "chunked"
     }
     
+    #Socket-timeout is currently broken in JRuby.
+    if RUBY_ENGINE != "jruby"
+      @headers_11["Keep-Alive"] = "timeout=15, max=30"
+    end
+    
     @cookies = []
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 +01:00
+date: 2012-03-04 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &27853120 !ruby/object:Gem::Requirement
+  requirement: &28196100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27853120
+  version_requirements: *28196100
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &27852420 !ruby/object:Gem::Requirement
+  requirement: &28195520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27852420
+  version_requirements: *28195520
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &27837000 !ruby/object:Gem::Requirement
+  requirement: &28194940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27837000
+  version_requirements: *28194940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27836360 !ruby/object:Gem::Requirement
+  requirement: &28194360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *27836360
+  version_requirements: *28194360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27835720 !ruby/object:Gem::Requirement
+  requirement: &28193840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *27835720
+  version_requirements: *28193840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &27835120 !ruby/object:Gem::Requirement
+  requirement: &28193300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *27835120
+  version_requirements: *28193300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &27834480 !ruby/object:Gem::Requirement
+  requirement: &28192780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27834480
+  version_requirements: *28192780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &27833880 !ruby/object:Gem::Requirement
+  requirement: &28192240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27833880
+  version_requirements: *28192240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &27833320 !ruby/object:Gem::Requirement
+  requirement: &28190420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27833320
+  version_requirements: *28190420
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3895621098014444760
+      hash: -2708344382107765429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: