rbg 1.0.2 → 1.1.0

data/lib/rbg.rb

@@ -20,9 +20,9 @@ module Rbg
     # and then forking the worker processes.
     def start_parent
       # Record the PID of this parent in the Master
-      self.child_processes << fork do
+      parent_pid = fork do
         # Clear the child process list as this fork doesn't have any children yet
-        self.child_processes = Array.new
+        self.child_processes = Hash.new
 
         # Set the process name (Parent)
         $0="#{self.config.name}[Parent]"
@@ -61,22 +61,33 @@ module Rbg
         # We may add memory management code here in the future
         loop do
           sleep 2
-          self.child_processes.dup.each do |p|
+          child_processes.dup.each do |id, opts|
             begin
-              Process.getpgid( p )
+              Process.getpgid(opts[:pid])
             rescue Errno::ESRCH
-              puts "Child process #{p} has died"
-              child_processes.delete(p)
+              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)
+              else
+                child_processes.delete(id)
+              end
             end
           end
+          
           if child_processes.empty?
             puts "All child processes died, exiting parent"
             Process.exit(0)
           end
         end
       end
+      
+      # Store the PID for the parent
+      child_processes[0] = {:pid => parent_pid, :respawns => 0}
       # Ensure the new parent is detached
-      Process.detach(self.child_processes.last)
+      Process.detach(parent_pid)
     end
     
     # Wrapper to fork multiple workers
@@ -87,10 +98,10 @@ module Rbg
     end
     
     # Fork a single worker
-    def fork_worker(i)
+    def fork_worker(id)
       pid = fork do
         # Set process name
-        $0="#{self.config.name}[#{i}]"
+        $0="#{config.name}[#{id}]"
         
         # Ending workers on INT is not useful or desirable
         Signal.trap('INT', proc {})
@@ -110,31 +121,33 @@ module Rbg
       end
       
       # Print some debug info and save the pid
-      puts "Spawned '#{self.config.name}[#{i}]' as PID #{pid}"
+      puts "Spawned #{config.name}[#{id}] (with PID #{pid})"
       STDOUT.flush
       
       # Detach to eliminate Zombie processes later
       Process.detach(pid)
       
       # Save the worker PID into the Parent's child process list
-      self.child_processes << pid
+      self.child_processes[id]            ||= {}
+      self.child_processes[id][:pid]      ||= pid
+      self.child_processes[id][:respawns] ||= 0
     end
     
     # Kill all child processes
     def kill_child_processes
       puts 'Killing child processes...'
       STDOUT.flush
-      self.child_processes.each do |p|
-        puts "Killing: #{p}"
+      self.child_processes.each do |id, opts|
+        puts "Killing #{config.name}[#{id}] (with PID #{opts[:pid]})"
         STDOUT.flush
         begin
-          Process.kill('TERM', p)
+          Process.kill('TERM', opts[:pid])
         rescue
           puts "Process already gone away"
         end
       end
       # Clear the child process list because we just killed them all
-      self.child_processes = Array.new
+      self.child_processes = Hash.new
     end
     
     # This is the master process, it spawns some workers then loops
@@ -186,11 +199,11 @@ module Rbg
           restart_needed = false
         end
         
-        self.child_processes.each do |p|
+        self.child_processes.each do |id, opts|
           begin
-            Process.getpgid( p )
+            Process.getpgid(opts[:pid])
           rescue Errno::ESRCH
-            puts "Parent process #{p} has died, exiting master"
+            puts "Parent process #{config.name}[#{id}] has died (from PID #{opts[:pid]}), exiting master"
             Process.exit(0)
           end
         end
@@ -229,7 +242,7 @@ module Rbg
       end
       
       # Initialize child process array
-      self.child_processes = Array.new
+      self.child_processes = Hash.new
       
       if options[:background]
         # Fork the master control process and return to a shell

data/lib/rbg/config.rb

@@ -7,6 +7,7 @@ module Rbg
     attr_accessor :log_path
     attr_accessor :pid_path
     attr_accessor :workers
+    attr_accessor :respawn_limit
     
     def root
       @root || File.expand_path('./')
@@ -24,6 +25,10 @@ module Rbg
       block_given? ? @script = block : @script
     end
     
+    def respawn_limit
+      @respawn_limit || 0
+    end
+    
     def before_fork(&block)
       block_given? ? @before_fork = block : @before_fork
     end

metadata

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