rbg 0.9.4 → 1.0.0

data/bin/rbg

@@ -2,8 +2,8 @@
 require 'rbg'
 
 def die
-    puts "Usage: " + $0 + " run|start|stop|reload -c config_file [-E environment]"
-    Process.exit(1)
+  puts "Usage: rbg run|start|stop|reload [-c config_file] [-E environment]"
+  Process.exit(1)
 end
 
 begin
@@ -19,6 +19,10 @@ begin
     end
   end
   
+  if config_file.nil?
+    config_file = "ProcessFile"
+  end
+  
   die unless config_file
   
   case command
@@ -28,7 +32,7 @@ begin
     Rbg.start(config_file, {:background => true, :environment => environment})
   when 'stop'
     Rbg.stop(config_file, {:environment => environment})
-  when 'reload'
+  when 'reload', 'restart'
     Rbg.reload(config_file, {:environment => environment})
   else
     die

data/lib/rbg.rb

@@ -98,8 +98,11 @@ module Rbg
         # Execure before_fork code
         self.config.after_fork.call
         
-        # The actual code to run
-        require self.config.script
+        if self.config.script.is_a?(String)
+          require self.config.script
+        elsif self.config.script.is_a?(Proc)
+          self.config.script.call
+        end
       end
       
       # Print some debug info and save the pid
@@ -143,13 +146,13 @@ module Rbg
       # This will load the before_fork in a clean process then fork the script as required
       self.start_parent
       
-      # If we get a USR1, send the existing workers a TERM before starting some new ones
+      # A restart is not required yet...
+      restart_needed = false
+      
+      # If we get a USR1, set this process as waiting for a restart
       Signal.trap("USR1", proc {
         puts "Master got a USR1."
-        STDOUT.flush
-        self.kill_child_processes
-        load_config
-        self.start_parent
+        restart_needed = true
       })
       
       # If we get a TERM, send the existing workers a TERM before bowing out
@@ -171,6 +174,14 @@ module Rbg
       # Main loop, we mostly idle, but check if the parent we created has died and exit
       loop do
         sleep 2
+        if restart_needed
+          STDOUT.flush
+          self.kill_child_processes
+          load_config
+          self.start_parent
+          restart_needed = false
+        end
+        
         self.child_processes.each do |p|
           begin
             Process.getpgid( p )

data/lib/rbg/config.rb

@@ -1,39 +1,35 @@
 module Rbg
   class Config
     
-    ## The name of the application as used in the proclist
     attr_accessor :name
-    
-    ## The ruby script which should be backgrounded
+    attr_accessor :root
     attr_accessor :script
-    
-    ## Path to the log file for the master process
     attr_accessor :log_path
-    
-    ## Path to the PID file for the master process
     attr_accessor :pid_path
-    
-    ## Number of workers to start
     attr_accessor :workers
     
-    ## Block of code to be executed in the master process before the process
-    ## has been forked.
+    def root
+      @root || File.expand_path('./')
+    end
+    
+    def log_path
+      @log_path || File.join(root, 'log', "#{name}.log")
+    end
+
+    def pid_path
+      @pid_path || File.join(root, 'log', "#{name}.pid")
+    end
+    
+    def script(&block)
+      block_given? ? @script = block : @script
+    end
+    
     def before_fork(&block)
-      if block_given?
-        @before_fork = block
-      else
-        @before_fork
-      end
+      block_given? ? @before_fork = block : @before_fork
     end
     
-    ## Block of code to be executed in the child process after forking has
-    ## taken place.
     def after_fork(&block)
-      if block_given?
-        @after_fork = block
-      else
-        @after_fork
-      end
+      block_given? ? @after_fork = block : @after_fork
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbg
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: charlie@atechmedia.com
@@ -19,8 +19,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rbg
-- lib/rbg.rb
 - lib/rbg/config.rb
+- lib/rbg.rb
 homepage: http://www.atechmedia.com
 licenses: []
 post_install_message: 
@@ -41,9 +41,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby Backgrounder allows multiple copies of ruby scripts to be run in the
   background and restarted
 test_files: []
+has_rdoc: false