bluepill 0.0.39 → 0.0.40

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/bin/bluepill

@@ -2,17 +2,11 @@
 require 'optparse'
 require 'bluepill'
 
-# Check for root
-unless ::Process.euid == 0
-  $stderr.puts "You must run bluepill as root."
-  exit(3)
-end
-
-
 # Default options
 options = {
-  :log_file => "/var/log/bluepill.log",
-  :base_dir => "/var/bluepill"
+  :log_file   => "/var/log/bluepill.log",
+  :base_dir   => "/var/bluepill",
+  :privileged => true
 }
 
 OptionParser.new do |opts|
@@ -30,6 +24,10 @@ OptionParser.new do |opts|
     exit
   end
 
+  opts.on("--[no-]privileged", "Allow/disallow to run #{$0} as non-privileged process. disallowed by default") do |v|
+    options[:privileged] = v
+  end
+
   help = lambda do
     puts opts
     puts
@@ -51,6 +49,12 @@ OptionParser.new do |opts|
   help.call if ARGV.empty?
 end.parse!
 
+# Check for root
+if options[:privileged] && ::Process.euid != 0
+  $stderr.puts "You must run bluepill as root or use --no-privileged option."
+  exit(3)
+end
+
 APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log)
 
 controller = Bluepill::Controller.new(options.slice(:base_dir, :log_file))
@@ -100,4 +104,4 @@ if options[:command] == "load"
 else
   target = ARGV.shift
   controller.handle_command(options[:application], options[:command], target)
-end
+end

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.39"
+  s.version = "0.0.40"
 
   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{2010-08-02}
+  s.date = %q{2010-08-21}
   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

@@ -171,23 +171,25 @@ module Bluepill
     def kill_previous_bluepill
       if File.exists?(self.pid_file)
         previous_pid = File.read(self.pid_file).to_i
-        begin
-          ::Process.kill(0, previous_pid)
-          puts "Killing previous bluepilld[#{previous_pid}]"
-          ::Process.kill(2, previous_pid)
-        rescue Exception => e
-          $stderr.puts "Encountered error trying to kill previous bluepill:"
-          $stderr.puts "#{e.class}: #{e.message}"
-          exit(4) unless e.is_a?(Errno::ESRCH)
-        else
-          10.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)
+        if System.pid_alive?(previous_pid)
+          begin
+            ::Process.kill(0, previous_pid)
+            puts "Killing previous bluepilld[#{previous_pid}]"
+            ::Process.kill(2, previous_pid)
+          rescue Exception => e
+            $stderr.puts "Encountered error trying to kill previous bluepill:"
+            $stderr.puts "#{e.class}: #{e.message}"
+            exit(4) unless e.is_a?(Errno::ESRCH)
+          else
+            10.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
       end

data/lib/bluepill/system.rb

@@ -192,12 +192,14 @@ module Bluepill
     # be sure to call this from a fork otherwise it will modify the attributes
     # of the bluepill daemon
     def drop_privileges(uid, gid)
-      uid_num = Etc.getpwnam(uid).uid if uid
-      gid_num = Etc.getgrnam(gid).gid if gid
+      if ::Process::Sys.geteuid == 0
+        uid_num = Etc.getpwnam(uid).uid if uid
+        gid_num = Etc.getgrnam(gid).gid if gid
 
-      ::Process.groups = [gid_num] if gid
-      ::Process::Sys.setgid(gid_num) if gid
-      ::Process::Sys.setuid(uid_num) if uid
+        ::Process.groups = [gid_num] if gid
+        ::Process::Sys.setgid(gid_num) if gid
+        ::Process::Sys.setuid(uid_num) if uid
+      end
     end
     
     def can_write_pid_file(pid_file, logger)

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.39"
+  VERSION = "0.0.40"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 0
-  - 39
-  version: 0.0.39
+  - 40
+  version: 0.0.40
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -07:00
+date: 2010-08-21 00:00:00 -07:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency