rbg 1.1.0 → 1.2.0

data/lib/rbg.rb

@@ -63,14 +63,37 @@ module Rbg
           sleep 2
           child_processes.dup.each do |id, opts|
             begin
+              
               Process.getpgid(opts[:pid])
+              
+              if config.memory_limit
+                # Lookup the memory usge for this PID
+                memory_usage = `ps -o rss= -p #{opts[:pid]}`.strip.to_i / 1024
+                if memory_usage > config.memory_limit
+                  puts "#{self.config.name}[#{id}] is using #{memory_usage}MB of memory (limit: #{config.memory_limit}MB). It will be killed."
+                  kill_child_process(id)
+                end
+              end
+              
             rescue Errno::ESRCH
               puts "Child process #{config.name}[#{id}] has died (from PID #{opts[:pid]})"
               child_processes[id][:pid] = nil
               
-              if config.respawn_limit > opts[:respawns]
-                child_processes[id][:respawns] += 1
-                fork_worker(id)
+              if config.respawn
+                if opts[:started_at] > Time.now - config.respawn_limits[1]
+                  if opts[:respawns] >= config.respawn_limits[0]
+                    puts "Process #{config.name}[#{id}] has instantly respawned #{opts[:respawns]} times. It won't be respawned again."
+                    child_processes.delete(id)
+                  else
+                    puts "Process has died within #{config.respawn_limits[1]}s of the last spawn."
+                    child_processes[id][:respawns] += 1
+                    fork_worker(id)
+                  end
+                else
+                  puts "Process was started more than #{config.respawn_limits[1]}s since the last spawn. Resetting spawn counter"
+                  child_processes[id][:respawns] = 0
+                  fork_worker(id)
+                end
               else
                 child_processes.delete(id)
               end
@@ -128,16 +151,15 @@ module Rbg
       Process.detach(pid)
       
       # Save the worker PID into the Parent's child process list
-      self.child_processes[id]            ||= {}
-      self.child_processes[id][:pid]      ||= pid
-      self.child_processes[id][:respawns] ||= 0
+      self.child_processes[id]                    ||= {}
+      self.child_processes[id][:pid]              ||= pid
+      self.child_processes[id][:respawns]         ||= 0
+      self.child_processes[id][:started_at]         = Time.now
     end
     
-    # Kill all child processes
-    def kill_child_processes
-      puts 'Killing child processes...'
-      STDOUT.flush
-      self.child_processes.each do |id, opts|
+    # Kill a given child process
+    def kill_child_process(id)
+      if opts = self.child_processes[id]
         puts "Killing #{config.name}[#{id}] (with PID #{opts[:pid]})"
         STDOUT.flush
         begin
@@ -146,7 +168,13 @@ module Rbg
           puts "Process already gone away"
         end
       end
-      # Clear the child process list because we just killed them all
+    end
+    
+    # Kill all child processes
+    def kill_child_processes
+      puts 'Killing child processes...'
+      STDOUT.flush
+      self.child_processes.keys.each { |id| kill_child_process(id) }
       self.child_processes = Hash.new
     end
     
@@ -278,11 +306,10 @@ module Rbg
     def pid_from_file
       raise Error, "PID not defined in '#{config_file}'" unless self.config.pid_path
       begin
-        pid = File.read(self.config.pid_path).strip.to_i
+        File.read(self.config.pid_path).strip.to_i
       rescue
         raise Error, "PID file not found"
       end
-      return pid
     end
     
     # Stop the running instance

data/lib/rbg/config.rb

@@ -7,7 +7,9 @@ module Rbg
     attr_accessor :log_path
     attr_accessor :pid_path
     attr_accessor :workers
-    attr_accessor :respawn_limit
+    attr_accessor :respawn
+    attr_accessor :respawn_limits
+    attr_accessor :memory_limit
     
     def root
       @root || File.expand_path('./')
@@ -25,8 +27,16 @@ module Rbg
       block_given? ? @script = block : @script
     end
     
-    def respawn_limit
-      @respawn_limit || 0
+    def respawn
+      @respawn || false
+    end
+    
+    def respawn_limits
+      @respawn_limits || [5, 30]
+    end
+    
+    def memory_limit
+      @memory_limit || nil
     end
     
     def before_fork(&block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbg
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: charlie@atechmedia.com