merb-core 1.0.8.1 → 1.0.9

data/lib/merb-core/bootloader.rb

@@ -359,7 +359,7 @@ end
 class Merb::BootLoader::Dependencies < Merb::BootLoader
 
   # ==== Returns
-  # Array[Gem::Dependency]:: The dependencies regiestered in init.rb.
+  # Array[Gem::Dependency]:: The dependencies registered in init.rb.
   #
   # :api: plugin
   cattr_accessor :dependencies
@@ -515,9 +515,11 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     #
     # :api: private
     def self.load_initfile
+      return nil if Merb.const_defined?("INIT_RB_LOADED")
       if File.exists?(initfile)
         STDOUT.puts "Loading init file from #{initfile}" unless Merb.testing?
         load(initfile)
+        Merb.const_set("INIT_RB_LOADED", true)
       elsif !Merb.testing?
         Merb.fatal! "You are not in a Merb application, or you are in " \
           "a flat application and have not specified the init file. If you " \

data/lib/merb-core/core_ext/kernel.rb

@@ -153,6 +153,8 @@ module Kernel
     end
 
     if block = dep.require_block
+      # reset the require block so it doesn't get called a second time
+      dep.require_block = nil
       block.call
     end
 

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

@@ -1,3 +1,46 @@
+module Merb
+  module System
+    class PortablePoller
+      def initialize(pid)
+        @pid = pid
+      end
+      # Memory usage in kilobytes (resident set size)
+      def memory
+        ps_int('rss')
+      end
+      
+      # Percentage memory usage
+      def percent_memory
+        ps_float('%mem')
+      end
+      
+      # Percentage CPU usage
+      def percent_cpu
+        ps_float('%cpu')
+      end
+      
+      private
+      
+      def ps_int(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.to_i
+      end
+      
+      def ps_float(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.to_f
+      end
+      
+      def ps_string(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.strip
+      end
+      
+      def time_string_to_seconds(text)
+        _, minutes, seconds, useconds = *text.match(/(\d+):(\d{2}).(\d{2})/)
+        (minutes.to_i * 60) + seconds.to_i
+      end
+    end
+  end
+end
+
 module Merb
   module Rack
     class AbstractAdapter
@@ -106,10 +149,27 @@ module Merb
           Thread.new do
             catch(:new_worker) do
               loop do
-                pid = @pids[port + i]
+                pid, status = @pids[port + i], nil
+                poller = Merb::System::PortablePoller.new(pid)
                 begin
-                  # Watch for the pid to exit.
-                  _, status = Process.wait2(pid)
+                  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]
+                      Process.kill("INT", pid)
+                      if (Process.kill(0, pid) rescue false)
+                        sleep Merb::Config[:hang_time] || 5
+                        Process.kill(9, pid)
+                        Process.wait2(pid) if (Process.kill(0, pid) rescue false)
+                      end
+                      
+                      status = Struct.new(:exitstatus).new(nil)
+                      break
+                    end
+                    sleep 0.25
+                  end
 
                   # If the pid doesn't exist, we want to silently exit instead of
                   # raising here.

data/lib/merb-core/version.rb

@@ -1,4 +1,5 @@
 module Merb
-  VERSION = '1.0.8.1' unless defined?(Merb::VERSION)
-  DM_VERSION = '0.9.9' unless defined?(Merb::DM_VERSION)
+  VERSION    = '1.0.9'  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.8.1
+  version: 1.0.9
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency