passenger 5.0.0.beta3 → 5.0.0.rc1

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -31,80 +31,80 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class ReopenLogsCommand < Command
-	include PhusionPassenger::Config::Utils
+    class ReopenLogsCommand < Command
+      include PhusionPassenger::Config::Utils
 
-	def run
-		parse_options
-		select_passenger_instance
-		perform_reopen_logs
-	end
+      def run
+        parse_options
+        select_passenger_instance
+        perform_reopen_logs
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner = "Usage: passenger-config reopen-logs [OPTIONS]\n"
-			opts.separator ""
-			opts.separator "  Instruct #{PROGRAM_NAME} agent processes to reopen their log files. This"
-			opts.separator "  should be involved after you've rotated logs. This command returns after"
-			opts.separator "  the log files have been reopened."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config reopen-logs [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Instruct #{PROGRAM_NAME} agent processes to reopen their log files. This"
+          opts.separator "  should be involved after you've rotated logs. This command returns after"
+          opts.separator "  the log files have been reopened."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--ignore-logs-not-available", "Exit successfully if #{PROGRAM_NAME}#{nl}" +
-				"was not configured with a log file") do
-				options[:ignore_logs_not_available] = true
-			end
-			opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
-				options[:instance] = value
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--ignore-logs-not-available", "Exit successfully if #{PROGRAM_NAME}#{nl}" +
+            "was not configured with a log file") do
+            options[:ignore_logs_not_available] = true
+          end
+          opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
+            options[:instance] = value
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def perform_reopen_logs
-		password = obtain_full_admin_password(@instance)
-		perform_reopen_logs_on("watchdog", "watchdog", password)
-		perform_reopen_logs_on("server", "server_admin", password)
-		perform_reopen_logs_on("logger", "logging_admin", password)
-		puts "All done"
-	end
+      def perform_reopen_logs
+        password = obtain_full_admin_password(@instance)
+        perform_reopen_logs_on("watchdog", "watchdog", password)
+        perform_reopen_logs_on("server", "server_admin", password)
+        perform_reopen_logs_on("logger", "logging_admin", password)
+        puts "All done"
+      end
 
-	def perform_reopen_logs_on(name, socket_name, password)
-		puts "Reopening logs for #{AGENT_EXE} #{name}"
-		request = Net::HTTP::Post.new("/reopen_logs.json")
-		request.basic_auth("admin", password)
-		request.content_type = "application/json"
-		response = @instance.http_request("agents.s/#{socket_name}", request)
-		if response["content-type"] == "application/json"
-			if response.code.to_i / 100 != 2
-				handle_error(name, response)
-			end
-		else
-			STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
-			STDERR.puts response.body
-			abort
-		end
-	end
+      def perform_reopen_logs_on(name, socket_name, password)
+        puts "Reopening logs for #{AGENT_EXE} #{name}"
+        request = Net::HTTP::Post.new("/reopen_logs.json")
+        request.basic_auth("admin", password)
+        request.content_type = "application/json"
+        response = @instance.http_request("agents.s/#{socket_name}", request)
+        if response["content-type"] == "application/json"
+          if response.code.to_i / 100 != 2
+            handle_error(name, response)
+          end
+        else
+          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts response.body
+          abort
+        end
+      end
 
-	def handle_error(name, response)
-		json = PhusionPassenger::Utils::JSON.parse(response.body)
-		if !should_ignore_error?(json)
-			STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
-			STDERR.puts json['message']
-			abort
-		end
-	end
+      def handle_error(name, response)
+        json = PhusionPassenger::Utils::JSON.parse(response.body)
+        if !should_ignore_error?(json)
+          STDERR.puts "*** An error occured while communicating with the #{AGENT_EXE} #{name} (code #{response.code}):"
+          STDERR.puts json['message']
+          abort
+        end
+      end
 
-	def should_ignore_error?(json)
-		return @options[:ignore_logs_not_available] && json["code"] == "NO_LOG_FILE"
-	end
-end
+      def should_ignore_error?(json)
+        return @options[:ignore_logs_not_available] && json["code"] == "NO_LOG_FILE"
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger

data/lib/phusion_passenger/config/restart_app_command.rb

@@ -32,172 +32,172 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
-module Config
+  module Config
 
-class RestartAppCommand < Command
-	include PhusionPassenger::Config::Utils
+    class RestartAppCommand < Command
+      include PhusionPassenger::Config::Utils
 
-	def run
-		parse_options
-		select_passenger_instance
-		select_app_group_name
-		perform_restart
-	end
+      def run
+        parse_options
+        select_passenger_instance
+        select_app_group_name
+        perform_restart
+      end
 
-private
-	def self.create_option_parser(options)
-		OptionParser.new do |opts|
-			nl = "\n" + ' ' * 37
-			opts.banner =
-				"Usage 1: passenger-config restart-app <APP PATH PREFIX> [OPTIONS]\n" +
-				"Usage 2: passenger-config restart-app --name <APP GROUP NAME> [OPTIONS]"
-			opts.separator ""
-			opts.separator "  Restart an application. The syntax determines how the application that is to"
-			opts.separator "  be restarted, will be selected."
-			opts.separator ""
-			opts.separator "  1. Selects all applications whose paths begin with the given prefix."
-			opts.separator ""
-			opts.separator "     Example: passenger-config restart-app /webapps"
-			opts.separator "     Restarts all apps whose path begin with /webapps, such as /webapps/foo,"
-			opts.separator "     /webapps/bar and /webapps123."
-			opts.separator ""
-			opts.separator "  2. Selects a specific application based on an exact match of its app group"
-			opts.separator "     name."
-			opts.separator ""
-			opts.separator "     Example: passenger-config restart-app --name /webapps/foo"
-			opts.separator "     Restarts only /webapps/foo, but not for example /webapps/foo/bar or"
-			opts.separator "     /webapps/foo123."
-			opts.separator ""
+    private
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner =
+            "Usage 1: passenger-config restart-app <APP PATH PREFIX> [OPTIONS]\n" +
+            "Usage 2: passenger-config restart-app --name <APP GROUP NAME> [OPTIONS]"
+          opts.separator ""
+          opts.separator "  Restart an application. The syntax determines how the application that is to"
+          opts.separator "  be restarted, will be selected."
+          opts.separator ""
+          opts.separator "  1. Selects all applications whose paths begin with the given prefix."
+          opts.separator ""
+          opts.separator "     Example: passenger-config restart-app /webapps"
+          opts.separator "     Restarts all apps whose path begin with /webapps, such as /webapps/foo,"
+          opts.separator "     /webapps/bar and /webapps123."
+          opts.separator ""
+          opts.separator "  2. Selects a specific application based on an exact match of its app group"
+          opts.separator "     name."
+          opts.separator ""
+          opts.separator "     Example: passenger-config restart-app --name /webapps/foo"
+          opts.separator "     Restarts only /webapps/foo, but not for example /webapps/foo/bar or"
+          opts.separator "     /webapps/foo123."
+          opts.separator ""
 
-			opts.separator "Options:"
-			opts.on("--name APP_GROUP_NAME", String, "The app group name to select") do |value|
-				options[:app_group_name] = value
-			end
-			opts.on("--rolling-restart", "Perform a rolling restart instead of a#{nl}" +
-				"regular restart (Enterprise only). The#{nl}" +
-				"default is a blocking restart") do |value|
-				if Config::Utils.is_enterprise?
-					options[:rolling_restart] = true
-				else
-					abort "--rolling-restart is only available in #{PROGRAM_NAME} Enterprise: #{ENTERPRISE_URL}"
-				end
-			end
-			opts.on("--ignore-app-not-running", "Exit successfully if the specified#{nl}" +
-				"application is not currently running. The#{nl}" +
-				"default is to exit with an error") do
-				options[:ignore_app_not_running] = true
-			end
-			opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
-				options[:instance] = value
-			end
-			opts.on("-h", "--help", "Show this help") do
-				options[:help] = true
-			end
-		end
-	end
+          opts.separator "Options:"
+          opts.on("--name APP_GROUP_NAME", String, "The app group name to select") do |value|
+            options[:app_group_name] = value
+          end
+          opts.on("--rolling-restart", "Perform a rolling restart instead of a#{nl}" +
+            "regular restart (Enterprise only). The#{nl}" +
+            "default is a blocking restart") do |value|
+            if Config::Utils.is_enterprise?
+              options[:rolling_restart] = true
+            else
+              abort "--rolling-restart is only available in #{PROGRAM_NAME} Enterprise: #{ENTERPRISE_URL}"
+            end
+          end
+          opts.on("--ignore-app-not-running", "Exit successfully if the specified#{nl}" +
+            "application is not currently running. The#{nl}" +
+            "default is to exit with an error") do
+            options[:ignore_app_not_running] = true
+          end
+          opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
+            options[:instance] = value
+          end
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+        end
+      end
 
-	def help
-		puts @parser
-	end
+      def help
+        puts @parser
+      end
 
-	def parse_options
-		super
-		case @argv.size
-		when 0
-			if !@options[:app_group_name]
-				abort "Please pass either an app path prefix or an app group name. " +
-					"See --help for more information."
-			end
-		when 1
-			if @options[:app_group_name]
-				abort "You've passed an app path prefix, but you cannot also pass an " +
-					"app group name. Please use only either one of them. See --help " +
-					"for more information."
-			end
-		else
-			help
-			abort
-		end
-	end
+      def parse_options
+        super
+        case @argv.size
+        when 0
+          if !@options[:app_group_name]
+            abort "Please pass either an app path prefix or an app group name. " +
+              "See --help for more information."
+          end
+        when 1
+          if @options[:app_group_name]
+            abort "You've passed an app path prefix, but you cannot also pass an " +
+              "app group name. Please use only either one of them. See --help " +
+              "for more information."
+          end
+        else
+          help
+          abort
+        end
+      end
 
-	def select_app_group_name
-		@groups = []
-		if app_group_name = @options[:app_group_name]
-			select_app_group_name_exact(app_group_name)
-		else
-			select_app_group_name_by_app_root_regex(@argv.first)
-		end
-	end
+      def select_app_group_name
+        @groups = []
+        if app_group_name = @options[:app_group_name]
+          select_app_group_name_exact(app_group_name)
+        else
+          select_app_group_name_by_app_root_regex(@argv.first)
+        end
+      end
 
-	def select_app_group_name_exact(name)
-		query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-			if group.elements["name"].text == name
-				@groups << group
-			end
-		end
-		if @groups.empty?
-			abort_app_not_found "There is no #{PROGRAM_NAME}-served application running " +
-				"with the app group name '#{name}'."
-		end
-	end
+      def select_app_group_name_exact(name)
+        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
+          if group.elements["name"].text == name
+            @groups << group
+          end
+        end
+        if @groups.empty?
+          abort_app_not_found "There is no #{PROGRAM_NAME}-served application running " +
+            "with the app group name '#{name}'."
+        end
+      end
 
-	def select_app_group_name_by_app_root_regex(app_root)
-		regex = /^#{Regexp.escape(app_root)}/
-		query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
-			if group.elements["app_root"].text =~ regex
-				@groups << group
-			end
-		end
-		if @groups.empty?
-			abort_app_not_found "There are no #{PROGRAM_NAME}-served applications running " +
-				"whose paths begin with '#{app_root}'."
-		end
-	end
+      def select_app_group_name_by_app_root_regex(app_root)
+        regex = /^#{Regexp.escape(app_root)}/
+        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
+          if group.elements["app_root"].text =~ regex
+            @groups << group
+          end
+        end
+        if @groups.empty?
+          abort_app_not_found "There are no #{PROGRAM_NAME}-served applications running " +
+            "whose paths begin with '#{app_root}'."
+        end
+      end
 
-	def perform_restart
-		restart_method = @options[:rolling_restart] ? "rolling" : "blocking"
-		@groups.each do |group|
-			group_name = group.elements["name"].text
-			puts "Restarting #{group_name}"
-			request = Net::HTTP::Post.new("/pool/restart_app_group.json")
-			request.basic_auth("admin", obtain_full_admin_password(@instance))
-			request.content_type = "application/json"
-			request.body = PhusionPassenger::Utils::JSON.generate(
-				:name => group_name,
-				:method => restart_method)
-			response = @instance.http_request("agents.s/server_admin", request)
-			if response.code.to_i / 100 == 2
-				return REXML::Document.new(response.body)
-			else
-				STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
-				STDERR.puts response.body
-				abort
-			end
-		end
-	end
+      def perform_restart
+        restart_method = @options[:rolling_restart] ? "rolling" : "blocking"
+        @groups.each do |group|
+          group_name = group.elements["name"].text
+          puts "Restarting #{group_name}"
+          request = Net::HTTP::Post.new("/pool/restart_app_group.json")
+          request.basic_auth("admin", obtain_full_admin_password(@instance))
+          request.content_type = "application/json"
+          request.body = PhusionPassenger::Utils::JSON.generate(
+            :name => group_name,
+            :method => restart_method)
+          response = @instance.http_request("agents.s/server_admin", request)
+          if response.code.to_i / 100 == 2
+            return REXML::Document.new(response.body)
+          else
+            STDERR.puts "*** An error occured while communicating with the #{PROGRAM_NAME} server:"
+            STDERR.puts response.body
+            abort
+          end
+        end
+      end
 
-	def abort_app_not_found(message)
-		if @options[:ignore_app_not_running]
-			STDERR.puts(message)
-			exit
-		else
-			abort(message)
-		end
-	end
+      def abort_app_not_found(message)
+        if @options[:ignore_app_not_running]
+          STDERR.puts(message)
+          exit
+        else
+          abort(message)
+        end
+      end
 
-	def query_pool_xml
-		request = Net::HTTP::Get.new("/pool.xml")
-		request.basic_auth("ro_admin", obtain_read_only_admin_password(@instance))
-		response = @instance.http_request("agents.s/server_admin", request)
-		if response.code.to_i / 100 == 2
-			return REXML::Document.new(response.body)
-		else
-			STDERR.puts "*** An error occured while querying the #{PROGRAM_NAME} server:"
-			STDERR.puts response.body
-			abort
-		end
-	end
-end
+      def query_pool_xml
+        request = Net::HTTP::Get.new("/pool.xml")
+        request.basic_auth("ro_admin", obtain_read_only_admin_password(@instance))
+        response = @instance.http_request("agents.s/server_admin", request)
+        if response.code.to_i / 100 == 2
+          return REXML::Document.new(response.body)
+        else
+          STDERR.puts "*** An error occured while querying the #{PROGRAM_NAME} server:"
+          STDERR.puts response.body
+          abort
+        end
+      end
+    end
 
-end # module Config
+  end # module Config
 end # module PhusionPassenger