merb-core 1.0.9 → 1.0.10

data/lib/merb-core/rack/adapter/abstract.rb

@@ -152,12 +152,13 @@ module Merb
                 pid, status = @pids[port + i], nil
                 poller = Merb::System::PortablePoller.new(pid)
                 begin
+                  i = 0
                   loop do                    
                     # Watch for the pid to exit.
                     _, status = Process.wait2(pid, Process::WNOHANG)
                     break if status
                     
-                    if Merb::Config[:max_memory] && poller.memory > Merb::Config[:max_memory]
+                    if (i % 120 == 0) && Merb::Config[:max_memory] && poller.memory > Merb::Config[:max_memory]
                       Process.kill("INT", pid)
                       if (Process.kill(0, pid) rescue false)
                         sleep Merb::Config[:hang_time] || 5
@@ -168,6 +169,7 @@ module Merb
                       status = Struct.new(:exitstatus).new(nil)
                       break
                     end
+                    i += 1
                     sleep 0.25
                   end
 

data/lib/merb-core/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  VERSION    = '1.0.9'  unless defined?(Merb::VERSION)
+  VERSION    = '1.0.10'  unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.10' unless defined?(Merb::DM_VERSION)
   DO_VERSION = '0.9.11' unless defined?(Merb::DO_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -238,6 +238,8 @@ files:
 - lib/merb-core.rbc
 has_rdoc: true
 homepage: http://merbivore.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -260,7 +262,7 @@ requirements:
 rubyforge_project: 
 rubygems_version: 1.3.1
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb. Pocket rocket web framework.
 test_files: []