bluepill 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/bin/bluepill

@@ -23,11 +23,6 @@ end.parse!
 
 APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log)
 
-unless File.writable?(options[:base_dir])
-  $stderr.puts "Error: You don't have permissions to #{options[:base_dir]}\nYou should run bluepill as root."
-  exit(3)
-end
-
 controller = Bluepill::Controller.new(options.slice(:base_dir))
 
 if controller.running_applications.include?(ARGV.first)

data/bluepill.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   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-12}
+  s.date = %q{2009-11-15}
   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}
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/arya/bluepill}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A process monitor written in Ruby with stability and minimalism in mind.}
   s.test_files = [
     "spec/blue-pill_spec.rb",
@@ -89,3 +89,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
   end
 end
+

data/lib/bluepill/controller.rb

@@ -55,6 +55,10 @@ module Bluepill
       [@sockets_dir, @pids_dir].each do |dir|
         FileUtils.mkdir_p(dir) unless File.exists?(dir)
       end
+      
+    rescue Errno::EACCES
+      $stderr.puts "Error: You don't have permissions to #{base_dir}\nYou should run bluepill as root."
+      exit(3)
     end
   end
 end

data/lib/bluepill/process.rb

@@ -231,16 +231,17 @@ module Bluepill
       logger.warning "Executing start command: #{start_command}"
       
       if self.daemonize?
-        child_pid = System.daemonize(start_command, self.system_command_options)
-        File.open(pid_file, "w") {|f| f.write(child_pid)}
+        System.daemonize(start_command, self.system_command_options)
         
       else
         # This is a self-daemonizing process
-        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:"
-          logger.warning result.inspect
+        with_timeout(start_grace_time) do
+          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:"
+            logger.warning result.inspect
+          end          
         end
       end
             
@@ -251,13 +252,16 @@ module Bluepill
       if stop_command
         cmd = process_command(stop_command)
         logger.warning "Executing stop command: #{cmd}"
-
-        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
-        end
         
+        with_timeout(stop_grace_time) do
+          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
+          end
+        end
+                
       else
         logger.warning "Executing default stop command. Sending TERM signal to #{actual_pid}"
         signal_process("TERM")
@@ -273,11 +277,13 @@ module Bluepill
         
         logger.warning "Executing restart command: #{cmd}"
         
-        result = System.execute_blocking(cmd, self.system_command_options)
-        
-        unless result[:exit_code].zero?
-          logger.warning "Restart command execution returned non-zero exit code:"
-          logger.warning result.inspect
+        with_timeout(restart_grace_time) do
+          result = System.execute_blocking(cmd, self.system_command_options)
+
+          unless result[:exit_code].zero?
+            logger.warning "Restart command execution returned non-zero exit code:"
+            logger.warning result.inspect
+          end
         end
         
         self.skip_ticks_for(restart_grace_time)
@@ -374,7 +380,22 @@ module Bluepill
     end
     
     def system_command_options
-      {:uid => self.uid, :gid => self.gid, :working_dir => self.working_dir, :logger => self.logger}
+      {
+        :uid         => self.uid, 
+        :gid         => self.gid, 
+        :working_dir => self.working_dir,
+        :pid_file    => self.pid_file,
+        :logger      => self.logger
+      }
+    end
+    
+    def with_timeout(secs, &blk)
+      Timeout.timeout(secs.to_f, &blk)
+      
+    rescue Timeout::Error
+      logger.err "Execution is taking longer than expected. Unmonitoring."
+      logger.err "Did you forget to tell bluepill to daemonize this process?"
+      self.dispatch!("unmonitor")
     end
   end
 end

data/lib/bluepill/system.rb

@@ -60,15 +60,35 @@ module Bluepill
         rd.close
 
         drop_privileges(options[:uid], options[:gid])
-
+        
+        # if we cannot write the pid file as the provided user, err out
+        exit unless can_write_pid_file(options[:pid_file], options[:logger])
+        
         to_daemonize = lambda do
+          # Setting end PWD env emulates bash behavior when dealing with symlinks
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
-          ::Kernel.exec(cmd)
+          
+          # 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]
+          
+          ::Kernel.exec(*args)
           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        
         wr.close
 
@@ -187,5 +207,16 @@ module Bluepill
       ::Process::Sys.setgid(gid_num) if gid
       ::Process::Sys.setuid(uid_num) if uid
     end
+    
+    def can_write_pid_file(pid_file, logger)
+      FileUtils.touch(pid_file)
+      File.unlink(pid_file)
+      return true
+      
+    rescue Exception => e
+      logger.warning "%s - %s" % [e.class.name, e.message]
+      e.backtrace.each {|l| logger.warning l}
+      return false
+    end
   end
 end

data/lib/example.rb

@@ -63,11 +63,15 @@ Bluepill.application(:sample_app) do |app|
   
   1.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.start_command = "sleep 10"
-      process.daemonize = true
-      process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
+      process.uid = "rohith"
+      process.gid = "wheel"
+      
+      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.pid_file = "/tmp/noperm/p_#{process.group}_#{i}.pid"
       
-      process.checks :always_true, :every => 10
+      # process.checks :always_true, :every => 5
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -08:00
+date: 2009-11-15 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A process monitor written in Ruby with stability and minimalism in mind.