bluepill 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/bin/bluepill

@@ -5,7 +5,8 @@ require 'bluepill'
 
 # defaults
 options = {
-  :log_file => "/var/log/bluepill.log"
+  :log_file => "/var/log/bluepill.log",
+  :base_dir => "/var/bluepill"
 }
 
 OptionParser.new do |opts|
@@ -22,6 +23,11 @@ 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)
@@ -36,10 +42,10 @@ elsif APPLICATION_COMMANDS.include?(ARGV.first)
       $stderr.puts "  #{index + 1}. #{app}"
     end
     $stderr.puts "Usage: bluepill [app] cmd [options]"
-    exit
+    exit(1)
   else
-    $stderr.puts "There are no running bluepill daemons.\nTo start a bluepill daemon, use: bluepill load <config file>"
-    exit
+    $stderr.puts "Error: There are no running bluepill daemons.\nTo start a bluepill daemon, use: bluepill load <config file>"
+    exit(2)
   end
 end
 

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   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-06}
+  s.date = %q{2009-11-12}
   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/application.rb

@@ -184,7 +184,15 @@ private
         rescue Exception => e
           exit unless e.is_a?(Errno::ESRCH)
         else
-          sleep 1 # wait for it to die
+          5.times do |i|
+            sleep 0.5
+            break unless System.pid_alive?(previous_pid)
+          end
+          
+          if System.pid_alive?(previous_pid)
+            $stderr.puts "Previous bluepilld[#{previous_pid}] didn't die"
+            exit(4)
+          end
         end
       end
       

data/lib/bluepill/controller.rb

@@ -6,7 +6,7 @@ module Bluepill
     attr_accessor :applications
     
     def initialize(options = {})
-      self.base_dir = options[:base_dir] || '/var/bluepill'
+      self.base_dir = options[:base_dir]
       self.sockets_dir = File.join(base_dir, 'socks')
       self.pids_dir = File.join(base_dir, 'pids')
       self.applications = Hash.new 

data/lib/bluepill/system.rb

@@ -14,6 +14,15 @@ module Bluepill
       :rss => 3
     }
     
+    def pid_alive?(pid)
+      begin
+        ::Process.kill(0, pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
+    
     def cpu_usage(pid)
       ps_axu[pid] && ps_axu[pid][IDX_MAP[:pcpu]].to_f
     end

data/lib/example.rb

@@ -48,7 +48,7 @@ Bluepill.application(:sample_app) do |app|
   
   0.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.group = "Poopfaced"
+      process.group = "group_1"
       process.pid_file = "/Users/rohith/ffs/tmp/pids/mongrel_#{i}.pid"
       process.start_command = "cd ~/ffs && mongrel_rails start -P #{process.pid_file} -p 3000 -d"
       
@@ -63,10 +63,9 @@ Bluepill.application(:sample_app) do |app|
   
   1.times do |i|
     app.process("group_process_#{i}") do |process|
-      process.start_command = "./sleeper"
+      process.start_command = "sleep 10"
       process.daemonize = true
       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.18
+  version: 0.0.19
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -08:00
+date: 2009-11-12 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency