@@ -26,8 +26,20 @@ controller = Bluepill::Controller.new(options.slice(:base_dir)) if controller.list.include?(ARGV.first) options[:application] = ARGV.shift -elsif controller.list.length == 1 && ALLOWED_COMMANDS.include?(ARGV.first) - options[:application] = controller.list.first +elsif ALLOWED_COMMANDS.include?(ARGV.first) + if controller.list.length == 1 + options[:application] = controller.list.first + elsif controller.list.length > 1 + $stderr.puts "You must specify an application name. Here's the list:" + controller.list.each_with_index do |app, index| + $stderr.puts " #{index + 1}. #{app}" + end + $stderr.puts "Usage: bluepill [app] cmd [options]" + exit + else + $stderr.puts "There are no running bluepill daemons.\nTo start a bluepill daemon, use: bluepill load <config file>" + exit + end end options[:command] = ARGV.shift bin/bluepill @@ -11,12 +11,25 @@ module Bluepill self.pids_dir = File.join(base_dir, 'pids') self.applications = Hash.new setup_dir_structure + cleanup end def list Dir[File.join(sockets_dir, "*.sock")].map{|x| File.basename(x, ".sock")} end + def cleanup + self.list.each do |app| + pid = pid_for(app) + if !pid || !alive?(pid) + pid_file = File.join(self.pids_dir, "#{app}.pid") + sock_file = File.join(self.sockets_dir, "#{app}.sock") + File.unlink(pid_file) if File.exists?(pid_file) + File.unlink(sock_file) if File.exists?(sock_file) + end + end + end + def send_cmd(application, command, *args) applications[application] ||= Application.new(application, {:base_dir => base_dir}) applications[application].send(command.to_sym, *args.compact) @@ -24,6 +37,21 @@ module Bluepill private + def pid_for(app) + pid_file = File.join(self.pids_dir, "#{app}.pid") + File.exists?(pid_file) && File.read(pid_file).to_i + end + + + def alive?(pid) + begin + ::Process.kill(0, pid) + true + rescue Errno::ESRCH + false + end + end + def setup_dir_structure [@sockets_dir, @pids_dir].each do |dir| FileUtils.mkdir_p(dir) unless File.exists?(dir) lib/bluepill/controller.rb 13ade3093affd8589d7317b34dadda915a9c9f71 Arya Asemanfar arya.asemanfar@gmail.com http://github.com/arya/bluepill/commit/3d833ed80ddb32a750270c969f60bcfcb1af0132 3d833ed80ddb32a750270c969f60bcfcb1af0132 2009-11-06T10:12:18-08:00 2009-11-06T10:12:18-08:00 error message for when you need to specify a sock file or there are no sock files 9772cbd323d122d5a1721924fccab4d60bd16b94 Arya Asemanfar arya.asemanfar@gmail.com