bluepill 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-05}
   s.default_executable = %q{bluepill}
   s.description = %q{Bluepill keeps your daemons up while taking up as little resources as possible. After all you probably want the resources of your server to be used by whatever daemons you are running rather than the thing that's supposed to make sure they are brought back up, should they die or misbehave.}
   s.email = %q{entombedvirus@gmail.com}

data/lib/bluepill/process.rb

@@ -10,6 +10,7 @@ module Bluepill
       
       :daemonize, 
       :pid_file, 
+      :working_dir,
       
       :start_grace_time, 
       :stop_grace_time, 
@@ -230,12 +231,12 @@ module Bluepill
       logger.warning "Executing start command: #{start_command}"
       
       if self.daemonize?
-        child_pid = System.daemonize(start_command, :uid => self.uid, :gid => self.gid)
+        child_pid = System.daemonize(start_command, self.system_command_options)
         File.open(pid_file, "w") {|f| f.write(child_pid)}
         
       else
         # This is a self-daemonizing process
-        result = System.execute_blocking(start_command, :uid => self.uid, :gid => self.gid, :logger => logger)
+        result = System.execute_blocking(start_command, self.system_command_options)
         
         unless result[:exit_code].zero?
           logger.warning "Start command execution returned non-zero exit code:"
@@ -251,7 +252,7 @@ module Bluepill
         cmd = process_command(stop_command)
         logger.warning "Executing stop command: #{cmd}"
 
-        result = System.execute_blocking(cmd, :uid => self.uid, :gid => self.gid)
+        result = System.execute_blocking(cmd, self.system_command_options)
         unless result[:exit_code].zero?
           logger.warning "Stop command execution returned non-zero exit code:"
           logger.warning result.inspect
@@ -272,7 +273,7 @@ module Bluepill
         
         logger.warning "Executing restart command: #{cmd}"
         
-        result = System.execute_blocking(cmd, :uid => self.uid, :gid => self.gid)
+        result = System.execute_blocking(cmd, self.system_command_options)
         
         unless result[:exit_code].zero?
           logger.warning "Restart command execution returned non-zero exit code:"
@@ -371,6 +372,10 @@ module Bluepill
     def process_command(cmd)
       cmd.to_s.gsub("{{PID}}", actual_pid.to_s)
     end
+    
+    def system_command_options
+      {:uid => self.uid, :gid => self.gid, :working_dir => self.working_dir, :logger => self.logger}
+    end
   end
 end
  

data/lib/bluepill/system.rb

@@ -52,7 +52,13 @@ module Bluepill
         
         drop_privileges(options[:uid], options[:gid])
         
-        daemon_id = Daemonize.call_as_daemon(lambda { ::Kernel.exec(cmd); exit }, nil, cmd)
+        to_daemonize = lambda do
+           Dir.chdir(options[:working_dir]) if options[:working_dir]
+           ::Kernel.exec(cmd)
+           exit
+         end
+        
+        daemon_id = Daemonize.call_as_daemon(to_daemonize, nil, cmd)
         
         wr.write daemon_id        
         wr.close
@@ -88,6 +94,8 @@ module Bluepill
           # grandchild
           drop_privileges(options[:uid], options[:gid])
           
+          Dir.chdir(options[:working_dir]) if options[:working_dir]
+          
           # close unused fds so ancestors wont hang. This line is the only reason we are not
           # using something like popen3. If this fd is not closed, the .read call on the parent
           # will never return because "wr" would still be open in the "exec"-ed cmd

data/lib/example.rb

@@ -46,7 +46,7 @@ Bluepill.application(:sample_app) do |app|
     end
   end
   
-  1.times do |i|
+  0.times do |i|
     app.process("group_process_#{i}") do |process|
       process.group = "Poopfaced"
       process.pid_file = "/Users/rohith/ffs/tmp/pids/mongrel_#{i}.pid"
@@ -61,12 +61,12 @@ Bluepill.application(:sample_app) do |app|
     end
   end
   
-  0.times do |i|
+  1.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.start_command = "sleep #{rand(30) + i}"
-      process.group = "Poopfaced_2"
+      process.start_command = "./sleeper"
       process.daemonize = true
-      process.pid_file = "#{ROOT_DIR}/pids/#{process.group}_process_#{i}.pid"
+      process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
+      process.working_dir = '/tmp/somedir'
       
       process.checks :always_true, :every => 10
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -08:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency