bluepill 0.0.20 → 0.0.21

data/README.markdown

@@ -120,6 +120,31 @@ And lastly, to monitor child processes:
     
 Note {{PID}} will be substituted for the pid of process in both the stop and restart commands.
 
+### A Note About Output Redirection
+
+While you can specify shell tricks like the following in the start_command of a process:
+    
+    Bluepill.application("app_name") do |app|
+      app.process("process_name") do |process|
+        process.start_command = "cd /tmp/some_dir && SOME_VAR=1 /usr/bin/some_start_command > /tmp/server.log 2>&1"
+        process.pid_file = "/tmp/some_pid_file.pid"
+      end
+    end
+    
+We recommend that you not do that and instead use the DSL to capture output from your daemons. Like so:
+
+    Bluepill.application("app_name") do |app|
+      app.process("process_name") do |process|
+        process.start_command = "/usr/bin/env SOME_VAR=1 /usr/bin/some_start_command"
+        
+        process.working_dir = "/tmp/some_dir"
+        process.stdout = process.stderr = "/tmp/server.log"
+        
+        process.pid_file = "/tmp/some_pid_file.pid"
+      end
+    end
+    
+
 ### CLI
 To start a bluepill process and load a config:
 

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   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-15}
+  s.date = %q{2009-11-16}
   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

@@ -8,6 +8,10 @@ module Bluepill
       :stop_command, 
       :restart_command, 
       
+      :stdout,
+      :stderr,
+      :stdin,
+      
       :daemonize, 
       :pid_file, 
       :working_dir,
@@ -385,7 +389,10 @@ module Bluepill
         :gid         => self.gid, 
         :working_dir => self.working_dir,
         :pid_file    => self.pid_file,
-        :logger      => self.logger
+        :logger      => self.logger,
+        :stdin       => self.stdin,
+        :stdout      => self.stdout,
+        :stderr      => self.stderr
       }
     end
     

data/lib/bluepill/system.rb

@@ -68,25 +68,14 @@ module Bluepill
           # Setting end PWD env emulates bash behavior when dealing with symlinks
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
           
-          # Forcing execution through bash to make output redirection and shell exapansion in commands work and still have
-          # bluepill monitor the correct process
-          args = ["/bin/sh", "-c", "--", cmd]
+          redirect_io(*options.values_at(:stdin, :stdout, :stderr))
           
-          ::Kernel.exec(*args)
+          ::Kernel.exec(cmd)
           exit
         end
 
         daemon_id = Daemonize.call_as_daemon(to_daemonize, nil, cmd)
-        
-        # Kludge. In order to make bluepill monitor the correct process while given start_commands of the form
-        # "cd /some/dir && ./some/server > /tmp/server.log 2>&1"
-        # we inspect the children of the "sh -c" process and pick it's single child. 
-        # There are many cases where this could break. If Bluepill is not monitoring the correct process, try
-        # simplyfying the start_command by moving all the bash scripting to a separate file and specifying that
-        # as the start_command. That said, this should work for 99% use cases.
-        spawned_children = get_children(daemon_id)
-        daemon_id = spawned_children.first if spawned_children.length == 1
-        
+                
         File.open(options[:pid_file], "w") {|f| f.write(daemon_id)}
         
         wr.write daemon_id        
@@ -218,5 +207,18 @@ module Bluepill
       e.backtrace.each {|l| logger.warning l}
       return false
     end
+    
+    def redirect_io(io_in, io_out, io_err)
+      $stdin.reopen(streams[io_in]) if io_in
+      
+      if !io_out.nil? && !io_err.nil? && io_out == io_err
+        $stdout.reopen(io_out)
+        $stderr.reopen($stdout)
+        
+      else
+        $stdout.reopen(io_out) if io_out
+        $stderr.reopen(io_err) if io_err
+      end
+    end
   end
 end

data/lib/example.rb

@@ -65,10 +65,14 @@ Bluepill.application(:sample_app) do |app|
     app.process("group_process_#{i}") do |process|
       process.uid = "rohith"
       process.gid = "wheel"
+
+      process.stderr = "/tmp/err.log"      
+      process.stdout = "/tmp/err.log"
+
       
       process.group = "grouped"
-      process.start_command = %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); sleep 10' 1>> /tmp/err.log 2>&1 }
-      process.daemonize = false
+      process.start_command = %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
+      process.daemonize = true
       process.pid_file = "/tmp/noperm/p_#{process.group}_#{i}.pid"
       
       # process.checks :always_true, :every => 5

metadata

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