knjappserver 0.0.17 → 0.0.18

data/Gemfile

@@ -3,9 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "knjrbfw", ">= 0.0.8"
+gem "knjrbfw"
 gem "erubis"
-gem "knjdbrevision", ">= 0.0.2"
 gem "mail"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -11,8 +11,6 @@ GEM
       rake
     json (1.6.1)
     json (1.6.1-java)
-    knjdbrevision (0.0.3)
-      knjrbfw (>= 0.0.3)
     knjrbfw (0.0.8)
     mail (2.3.0)
       i18n (>= 0.4.0)
@@ -45,8 +43,7 @@ DEPENDENCIES
   erubis
   jeweler (~> 1.6.3)
   json
-  knjdbrevision (>= 0.0.2)
-  knjrbfw (>= 0.0.8)
+  knjrbfw
   mail
   rcov
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-02-21}
+  s.date = %q{2012-02-25}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -98,9 +98,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.8"])
+      s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
-      s.add_runtime_dependency(%q<knjdbrevision>, [">= 0.0.2"])
       s.add_runtime_dependency(%q<mail>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -109,9 +108,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<knjrbfw>, [">= 0.0.8"])
+      s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
-      s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
       s.add_dependency(%q<mail>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -121,9 +119,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<knjrbfw>, [">= 0.0.8"])
+    s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
-    s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
     s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/include/class_httpsession_http_request.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "knj/web"
 
 #If we are running on JRuby or Rubinius this will seriously speed things up if we are behind a proxy.
 if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"

data/lib/include/class_knjappserver.rb

@@ -15,7 +15,8 @@ class Knjappserver
       :default_page => "index.rhtml",
       :default_filetype => "text/html",
       :max_requests_working => 20,
-      :size_send => 1024
+      :size_send => 1024,
+      :cleaner_timeout => 300
     }.merge(config)
     
     @config[:smtp_args] = {"smtp_host" => "localhost", "smtp_port" => 25} if !@config[:smtp_args]
@@ -270,6 +271,11 @@ class Knjappserver
         :name => :request_begin,
         :connections_max => 1
       )
+      
+      #This event is used if the user himself wants stuff to be cleaned up when the appserver is cleaning up stuff.
+      @events.add_event(
+        :name => :on_clean
+      )
     end
     
     #Set up the 'vars'-variable that can be used to set custom global variables for web-requests.

data/lib/include/class_knjappserver_cleaner.rb

@@ -91,32 +91,51 @@ class Knjappserver
     end
     
     #This flushes (writes) all session-data to the server and deletes old unused sessions from the database.
-    self.timeout(:time => 300) do
+    self.timeout(:time => @config[:cleaner_timeout]) do
+      self.clean
+    end
+	end
+	
+	#This method can be used to clean the appserver. Dont call this from a HTTP-request.
+	def clean
+    self.paused_exec do
       STDOUT.print "Cleaning sessions on appserver.\n" if @config[:debug]
       
-      self.paused_exec do
-        session_not_ids = []
-        time_check = Time.now.to_i - 300
-        newsessions = {}
-        @sessions.each do |session_hash, session_data|
-          session_data[:dbobj].flush
-          
-          if session_data[:time_lastused].to_i > time_check
-            newsessions[session_hash] = session_data
-            session_not_ids << session_data[:dbobj].id
-          end
-        end
-        
-        @sessions = newsessions
+      #Clean up various inactive sessions.
+      session_not_ids = []
+      time_check = Time.now.to_i - 300
+      newsessions = {}
+      @sessions.each do |session_hash, session_data|
+        session_data[:dbobj].flush
         
-        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(idhash)
+        if session_data[:time_lastused].to_i > time_check
+          newsessions[session_hash] = session_data
+          session_not_ids << session_data[:dbobj].id
         end
       end
+      
+      @sessions = newsessions
+      
+      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(idhash)
+      end
+      
+      
+      #Clean database weak references from the tables-module.
+      @db.clean
+      
+      #Clean the object-handler.
+      @ob.clean_all
+      
+      #Run garbage-collector.
+      GC.start
+      
+      #Call various user-connected methods.
+      @events.call(:on_clean) if @events
     end
 	end
 end

data/lib/include/class_knjappserver_threadding.rb

@@ -1,7 +1,7 @@
 class Knjappserver
   def initialize_threadding
     @config[:threadding] = {} if !@config.has_key?(:threadding)
-    @config[:threadding][:max_running] = 1 if !@config[:threadding].has_key?(:max_running)
+    @config[:threadding][:max_running] = 8 if !@config[:threadding].has_key?(:max_running)
     
     @threadpool = Knj::Threadpool.new(:threads => @config[:threadding][:max_running], :sleep => 0.1)
     @threadpool.events.connect(:on_error) do |event, error|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 +01:00
+date: 2012-02-25 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &16146280 !ruby/object:Gem::Requirement
+  requirement: &27853120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16146280
+  version_requirements: *27853120
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &16145700 !ruby/object:Gem::Requirement
+  requirement: &27852420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16145700
-- !ruby/object:Gem::Dependency
-  name: knjdbrevision
-  requirement: &16145200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *16145200
+  version_requirements: *27852420
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &16144680 !ruby/object:Gem::Requirement
+  requirement: &27837000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16144680
+  version_requirements: *27837000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16144020 !ruby/object:Gem::Requirement
+  requirement: &27836360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *16144020
+  version_requirements: *27836360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16143360 !ruby/object:Gem::Requirement
+  requirement: &27835720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16143360
+  version_requirements: *27835720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16141740 !ruby/object:Gem::Requirement
+  requirement: &27835120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *16141740
+  version_requirements: *27835120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16090320 !ruby/object:Gem::Requirement
+  requirement: &27834480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16090320
+  version_requirements: *27834480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16089600 !ruby/object:Gem::Requirement
+  requirement: &27833880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16089600
+  version_requirements: *27833880
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16088860 !ruby/object:Gem::Requirement
+  requirement: &27833320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16088860
+  version_requirements: *27833320
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -217,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3001161973856161206
+      hash: -3895621098014444760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: