@@ -20,18 +20,19 @@ OptionParser.new do |opts| end end.parse! -APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit) +APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log) controller = Bluepill::Controller.new(options.slice(:base_dir)) -if controller.list.include?(ARGV.first) +if controller.running_applications.include?(ARGV.first) + # the first arg is the application name options[:application] = ARGV.shift elsif APPLICATION_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| + if controller.running_applications.length == 1 + options[:application] = controller.running_applications.first + elsif controller.running_applications.length > 1 + $stderr.puts "You must specify an application name. Here's the list of running applications:" + controller.running_applications.each_with_index do |app, index| $stderr.puts " #{index + 1}. #{app}" end $stderr.puts "Usage: bluepill [app] cmd [options]" @@ -47,20 +48,23 @@ options[:command] = ARGV.shift case options[:command] when "load" file = ARGV.shift - eval(File.read(file)) - + if File.exists?(file) + eval(File.read(file)) + else + $stderr.puts "Can't find file: #{file}" + end when "log" orig_pattern = pattern = ARGV.shift pattern = controller.send_cmd(options[:application], :grep_pattern, pattern) cmd = "tail -n 100 -f #{options[:log_file]} | grep -E '#{pattern}'" - cmd = "echo 'Tailing log for #{orig_pattern}...'; #{cmd}" + puts "Tailing log for #{orig_pattern}..." Kernel.exec(cmd) when *APPLICATION_COMMANDS process_or_group_name = ARGV.shift puts controller.send_cmd(options[:application], options[:command], process_or_group_name) - + else puts "Unknown command `%s` (or application `%s` has not been loaded yet)" % [options[:command], options[:command]] end \ No newline at end of file bin/bluepill @@ -14,12 +14,19 @@ module Bluepill cleanup end - def list + def running_applications Dir[File.join(sockets_dir, "*.sock")].map{|x| File.basename(x, ".sock")} end + def send_cmd(application, command, *args) + applications[application] ||= Application.new(application, {:base_dir => base_dir}) + applications[application].send(command.to_sym, *args.compact) + end + + private + def cleanup - self.list.each do |app| + self.running_applications.each do |app| pid = pid_for(app) if !pid || !alive?(pid) pid_file = File.join(self.pids_dir, "#{app}.pid") @@ -30,19 +37,11 @@ module Bluepill 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) - end - - 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) lib/bluepill/controller.rb f72d323d98d58ee58482816f7b33b5914395f6cd Arya Asemanfar arya.asemanfar@gmail.com http://github.com/arya/bluepill/commit/a86d5a238f1783782624bc37ecc5aad3fd9bc23c a86d5a238f1783782624bc37ecc5aad3fd9bc23c 2009-11-06T14:30:41-08:00 2009-11-06T14:30:41-08:00 cleaned up bin a little bit fe781753118ad5ae2d1032d7b22fa10faa5a82d4 Arya Asemanfar arya.asemanfar@gmail.com