lib/scout/command.rb in scout-5.9.10.pre vs lib/scout/command.rb in scout-5.9.11

- old
+ new

@@ -38,11 +38,11 @@ opts.separator " #{program_name}" opts.separator " ... OR ..." opts.separator " #{program_name} [OPTIONS] install" opts.separator " Troubleshoot:" opts.separator " #{program_name} [OPTIONS] troubleshoot" - opts.separator " ... print troubleshooting info, or post it back to scoutapp.com." + opts.separator " ... print troubleshooting info, or post it back to server.pingdom.com." opts.separator " Local plugin testing:" opts.separator " #{program_name} [OPTIONS] test " + "PATH_TO_PLUGIN [PLUGIN_OPTIONS]" opts.separator "[PLUGIN_OPTIONS] format: opt1=val1 opt2=val2 opt2=val3 ..." opts.separator "Plugin will use internal defaults if options aren't provided." @@ -53,11 +53,11 @@ opts.separator "invoked through cron or any other scheduler." opts.separator " " opts.separator "Specific Options:" opts.separator "--------------------------------------------------------------------------" opts.on( "-r", "--roles role1,role2", String, - "Roles for this server. Roles are defined through scoutapp.com's web UI" ) do |roles| + "Roles for this server. Roles are defined through server.pingdom.com's web UI" ) do |roles| options[:roles] = roles end opts.on( "-s", "--server SERVER", String, "The URL for the server to report to." ) do |url| @@ -91,11 +91,11 @@ opts.on("--hostname HOSTNAME", String, "Optionally override the hostname." ) do |hostname| options[:hostname] = hostname end - opts.on( "-e", "--environment ENVIRONMENT", String, "Environment for this server. Environments are defined through scoutapp.com's web UI" ) do |environment| + opts.on( "-e", "--environment ENVIRONMENT", String, "Environment for this server. Environments are defined through server.pingdom.com's web UI" ) do |environment| options[:environment] = environment end opts.separator " " opts.separator "Common Options:" @@ -121,11 +121,11 @@ end opts.separator " " opts.separator "Troubleshooting Options:" opts.separator "--------------------------------------------------------------------------" - opts.on( "--post", "For use with 'troubleshoot' - post the troubleshooting results back to scoutapp.com") do + opts.on( "--post", "For use with 'troubleshoot' - post the troubleshooting results back to server.pingdom.com") do options[:troubleshoot_post] = true end opts.on( "--no-history", "For use with 'troubleshoot' - don't include the history file contents.") do options[:troubleshoot_no_history] = true end @@ -169,11 +169,11 @@ command.run end def initialize(options, args) @roles = options[:roles] - @server = options[:server] || "https://scoutapp.com/" + @server = options[:server] || "https://server.pingdom.com/" @history = options[:history] || File.join( File.join( (File.expand_path("~") rescue "/"), ".scout" ), "client_history.yaml" ) @verbose = options[:verbose] || false @@ -277,10 +277,10 @@ end # pid.is_a?(Fixnum) if running if pid == "unknown" log.warn "Could not create or read PID file. " + "You may need to specify the path to the config directory. " + - "See: http://scoutapp.com/help#data_file" if log + "See: http://server.pingdom.com/help#data_file" if log else log.warn "Process #{pid} was already running" if log end exit else