@@ -20,13 +20,13 @@ OptionParser.new do |opts| end end.parse! -ALLOWED_COMMANDS = %w(status start stop restart log unmonitor quit) +APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit) controller = Bluepill::Controller.new(options.slice(:base_dir)) if controller.list.include?(ARGV.first) options[:application] = ARGV.shift -elsif ALLOWED_COMMANDS.include?(ARGV.first) +elsif APPLICATION_COMMANDS.include?(ARGV.first) if controller.list.length == 1 options[:application] = controller.list.first elsif controller.list.length > 1 @@ -57,7 +57,7 @@ when "log" cmd = "echo 'Tailing log for #{orig_pattern}...'; #{cmd}" Kernel.exec(cmd) -when *ALLOWED_COMMANDS +when *APPLICATION_COMMANDS process_or_group_name = ARGV.shift puts controller.send_cmd(options[:application], options[:command], process_or_group_name) bin/bluepill @@ -124,11 +124,11 @@ module Bluepill end def send_to_server(method) + buffer = "" begin status = Timeout::timeout(self.socket_timeout) do self.socket = Bluepill::Socket.new(name, base_dir).client # Something that should be interrupted if it takes too much time... socket.write(method + "\n") - buffer = "" while(line = socket.gets) buffer << line end @@ -138,7 +138,7 @@ module Bluepill rescue Errno::ECONNREFUSED abort("Connection Refused: Server is not running") end - return buffer + buffer end private lib/bluepill/application.rb 8053fc9d93779321e16af58a68fecd36627ea642 Arya Asemanfar arya.asemanfar@gmail.com http://github.com/arya/bluepill/commit/2025e88dae1b5b2094ec2107452a6086546c2aa7 2025e88dae1b5b2094ec2107452a6086546c2aa7 2009-11-06T14:16:11-08:00 2009-11-06T14:16:11-08:00 fixed variable scope error b07695f72847d173d399c7cbe5a29ce2be5cfa40 Arya Asemanfar arya.asemanfar@gmail.com