right_link 5.9.1 → 5.9.2

data/scripts/log_level_manager.rb

@@ -1,7 +1,7 @@
 # === Synopsis:
-#   RightScale Log Level Manager (rs_log_level) - (c) 2009-2011 RightScale Inc
+#   RightScale Log Level Manager (rs_log_level) - (c) 2009-2013 RightScale Inc
 #
-#   Log level manager allows setting and retrieving the RightLink agent
+#   Log level manager allows setting and retrieving the RightLink agent and Chef/RightScript
 #   log level.
 #
 # === Examples:
@@ -16,20 +16,26 @@
 #    rs_set_log_level [--log-level, -l debug|info|warn|error|fatal]
 #
 #    Options:
-#      --log-level, -l LVL  Set log level of RightLink agent
+#      --log-level, -l LVL  Set log level(for Chef/RightScript by default)
+#      --agent              Set/get log level of RightLink agent
 #      --verbose, -v        Display debug information
 #      --help:              Display help
 #      --version:           Display version information
 #
-#    No options prints the current RightLink agent log level
+#    No options prints the current Chef/RightScript log level
 #
 
 require 'right_agent/scripts/log_level_manager'
 require 'trollop'
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'tagger'))
 
 module RightScale
 
   class RightLinkLogLevelManager < LogLevelManager
+    include CommandHelper
+
+    LOG_LEVEL_TAG = "rs_agent_dev:log_level"
 
     # Convenience wrapper for creating and running log level manager
     #
@@ -39,6 +45,7 @@ module RightScale
       m = RightLinkLogLevelManager.new
 
       options = m.parse_args
+      m.check_privileges
       m.manage(options)
 
       if options[:level] =~ /debug/i && !RightScale::Platform.windows?
@@ -47,10 +54,25 @@ module RightScale
         puts "      log daemon may discard these messages. If debug messages do not appear,"
         puts "      review your syslog configuration and restart the daemon."
       end
-    rescue Errno::EACCES => e
-      write_error(e.message)
-      write_error("Try elevating privilege (sudo/runas) before invoking this command.")
-      exit(2)
+    end
+
+    def manage(options)
+      return super(options) if options[:agent]
+      cmd = options[:level] ? { :name => :add_tag,  } : { :name => :get_tags }
+      cmd[:tag] = "#{LOG_LEVEL_TAG}=#{options[:level]}" if options[:level]
+      res = send_command(cmd, options[:verbose], Tagger::TAG_REQUEST_TIMEOUT)
+      case cmd[:name]
+      when :get_tags
+        fail("Getting log level failed: #{res.inspect}") unless res.kind_of?(Array)
+        log_level_tag = res.detect { |tag| tag.start_with?(LOG_LEVEL_TAG) }
+        level = log_level_tag ? log_level_tag.split("=").last : send_command({ :name => 'get_log_level' }, options[:verbose], 5)
+        write_output("Chef/RightScript log level: #{level.to_s.upcase}")
+      when :add_tag
+        r = serialize_operation_result(res)
+        fail("Setting log level failed: #{r.inspect}") unless r.kind_of?(OperationResult)
+        fail("Setting log level failed: #{r.content}") unless r.success?
+        write_output("Successfully set log level to #{options[:level]}")
+      end
     end
 
     # Create options hash from command line arguments
@@ -62,31 +84,22 @@ module RightScale
 
       parser = Trollop::Parser.new do
         opt :level, "", :type => String, :long => "--log-level", :short => "-l"
+        opt :agent
         opt :verbose
         version ""
       end
 
-      begin
+      parse do
         options.merge!(parser.parse)
         if options[:level]
           fail("Invalig log level '#{options[:level]}'") unless AgentManager::LEVELS.include?(options[:level].to_sym)
         end
         options
-      rescue Trollop::HelpNeeded
-        write_output(Usage.scan(__FILE__))
-        exit
-      rescue Trollop::VersionNeeded
-        write_output(version)
-        succeed
-      rescue SystemExit => e
-        raise e
-      rescue Exception => e
-        write_output(e.message + "\nUse --help for additional information")
-        exit(1)
       end
     end
     
 protected
+
     # Writes to STDOUT (and a placeholder for spec mocking).
     #
     # === Parameters
@@ -99,7 +112,7 @@ protected
     #
     # === Parameters
     # @param [String] message to write
-    def write_error(message)
+    def self.write_error(message)
       STDERR.puts(message)
     end
 
@@ -108,12 +121,11 @@ protected
     # === Return
     # (String):: Version information
     def version
-      gemspec = eval(File.read(File.join(File.dirname(__FILE__), '..', 'right_link.gemspec')))
-      "rs_log_level #{gemspec.version} - RightLink's log level (c) 2011 RightScale"
+      "rs_log_level #{right_link_version} - RightLink's log level (c) 2013 RightScale"
     end
 
-    def succeed
-      exit(0)
+    def usage
+      Usage.scan(__FILE__)
     end
 
   end

data/scripts/ohai_runner.rb

@@ -1,5 +1,5 @@
 # === Synopsis:
-#   RightScale Ohai Runner - Copyright (c) 2012 by RightScale Inc
+#   RightScale Ohai Runner - Copyright (c) 2013 by RightScale Inc
 #
 #   runs Ohai in the RightScale environment
 #

data/scripts/reenroller.rb

@@ -1,5 +1,5 @@
 # === Synopsis:
-#   RightScale Re-enroller (rs_reenroll) - (c) 2010-2011 RightScale Inc
+#   RightScale Re-enroller (rs_reenroll) - (c) 2010-2013 RightScale Inc
 #
 #   Re-enroller causes the instance to re-enroll
 #   CAUTION: This process may take a while to take place, during that time
@@ -21,12 +21,14 @@ require 'fileutils'
 require 'right_agent'
 require 'right_agent/scripts/usage'
 require 'right_agent/scripts/common_parser'
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
 
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'agent_config'))
 
 module RightScale
 
   class Reenroller
+    include CommandHelper
 
     if RightScale::Platform.windows?
       # Note we currently only need a reenroller state file under windows.
@@ -96,17 +98,8 @@ module RightScale
         version ""
       end
 
-      begin
+      parse do
         parser.parse
-      rescue Trollop::HelpNeeded
-        puts Usage.scan(__FILE__)
-        exit
-      rescue Trollop::VersionNeeded
-        puts version
-        exit(0)
-      rescue Trollop::CommandlineError => e
-        puts e.message + "\nUse --help for additional information"
-        exit(1)
       end
     end
 
@@ -162,8 +155,11 @@ module RightScale
     # === Return
     # (String):: Version information
     def version
-      gemspec = eval(File.read(File.join(File.dirname(__FILE__), '..', 'right_link.gemspec')))
-      "rs_reenroll #{gemspec.version} - RightLink's reenroller (c) 2011 RightScale"
+      "rs_reenroll #{right_link_version} - RightLink's reenroller (c) 2013 RightScale"
+    end
+
+    def usage
+      Usage.scan(__FILE__)
     end
 
   end # Reenroller

data/scripts/server_importer.rb

@@ -1,5 +1,5 @@
 # === Synopsis:
-#   RightScale Server Import Utility (rs_connect) - (c) 2011 RightScale Inc
+#   RightScale Server Import Utility (rs_connect) - (c) 2013 RightScale Inc
 #
 #   This utility allows an arbitrary virtual or physical machine to be
 #   managed by the RightScale dashboard.
@@ -32,10 +32,12 @@ require 'right_agent/scripts/usage'
 require 'right_agent/scripts/common_parser'
 require 'right_http_connection'
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
 
 module RightScale
 
   class ServerImporter
+    include CommandHelper
     # Exception class to use as a token that something went wrong with an HTTP query
     class QueryFailed < Exception; end
 
@@ -136,55 +138,22 @@ module RightScale
         version ""
       end
 
-      begin
+      parse do
         options.merge(parser.parse)
-      rescue Trollop::HelpNeeded
-        puts Usage.scan(__FILE__)
-        exit
-      rescue Trollop::CommandlineError => e
-        puts e.message + "\nUse --help for additional information"
-        exit(1)
-      rescue Trollop::VersionNeeded
-        puts version
-        succeed
       end
     end
 
 protected
-
-    # Print error on console and exit abnormally
-    #
-    # === Parameter
-    # reason(String|Exception):: Error message or exception, default to nil (no message printed)
-    # print_usage(Boolean):: Whether script usage should be printed, default to false
-    #
-    # === Return
-    # R.I.P. does not return
-    def fail(reason=nil, print_usage=false)
-      case reason
-      when Errno::EACCES
-        STDERR.puts reason.message
-        STDERR.puts "Try elevating privilege (sudo/runas) before invoking this command."
-        code = 2
-      when Exception
-        STDERR.puts "** #{reason.message}"
-        code = 1
-      else
-        STDERR.puts "** #{reason}" if reason
-        code = 1
-      end
-
-      puts Usage.scan(__FILE__) if print_usage
-      exit(code)
-    end
-    
     # Version information
     #
     # === Return
     # (String):: Version information
     def version
-      gemspec = eval(File.read(File.join(File.dirname(__FILE__), '..', 'right_link.gemspec')))
-      "rs_connect #{gemspec.version} - RightLink's server importer (c) 2011 RightScale"
+      "rs_connect #{right_link_version} - RightLink's server importer (c) 2013 RightScale"
+    end
+
+    def usage
+      Usage.scan(__FILE__)
     end
 
     private
@@ -285,9 +254,6 @@ protected
       return uri
     end
 
-    def succeed
-      exit(0)
-    end
   end
 
 end

data/scripts/shutdown_client.rb

@@ -1,5 +1,5 @@
 # === Synopsis:
-#   RightScale System Shutdown Utility (rs_shutdown) - (c) 2011 RightScale Inc
+#   RightScale System Shutdown Utility (rs_shutdown) - (c) 2013 RightScale Inc
 #
 #   This utility allows the given system to be shutdown or rebooted.
 #
@@ -35,10 +35,12 @@ require 'right_agent/scripts/usage'
 require 'right_agent/scripts/common_parser'
 
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'shutdown_request'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
 
 module RightScale
 
   class ShutdownClient
+    include CommandHelper
 
     # Run
     #
@@ -48,17 +50,14 @@ module RightScale
     # === Return
     # true:: Always return true
     def run(options)
+      check_privileges
       fail("Missing required shutdown argument") unless options[:level]
       cmd = {}
       cmd[:name] = :set_shutdown_request
       cmd[:level] = options[:level]
       cmd[:immediately] = options[:immediately]
-      config_options = AgentConfig.agent_options('instance')
-      listen_port = config_options[:listen_port]
-      fail('Could not retrieve agent listen port') unless listen_port
-      client = CommandClient.new(listen_port, config_options[:cookie])
       begin
-        client.send_command(cmd, options[:verbose]) do |response|
+        send_command(cmd, options[:verbose]) do |response|
           if response[:error]
             fail("Failed #{cmd.inspect} with #{response[:error]}")
           else
@@ -94,66 +93,27 @@ module RightScale
         conflicts :deferred, :immediately
       end
 
-      begin
+      parse do
         options.merge!(parser.parse)
         options[:level] = ::RightScale::ShutdownRequest::REBOOT if options[:reboot]
         options[:level] = ::RightScale::ShutdownRequest::STOP if options[:stop]
         options[:level] = ::RightScale::ShutdownRequest::TERMINATE if options[:terminate]
         options[:immediately] = false if options[:deferred]
-      rescue Trollop::VersionNeeded
-        puts version
-        succeed
-      rescue Trollop::HelpNeeded
-        puts Usage.scan(__FILE__)
-        exit
-      rescue SystemExit => e
-        raise e
-      rescue Exception => e
-        puts e.message + "\nUse --help for additional information"
-        exit(1)
       end
       options
     end
 
 protected
-
-    # Print error on console and exit abnormally
-    #
-    # === Parameter
-    # reason(String|Exception):: Error message or exception, default to nil (no message printed)
-    # print_usage(Boolean):: Whether script usage should be printed, default to false
-    #
-    # === Return
-    # R.I.P. does not return
-    def fail(reason=nil, print_usage=false)
-      case reason
-      when Errno::EACCES
-        STDERR.puts "** #{reason.message}"
-        STDERR.puts "** Try elevating privilege (sudo/runas) before invoking this command."
-        code = 2
-      when Exception
-        STDERR.puts "** #{reason.message}"
-        code = 1
-      else
-        STDERR.puts "** #{reason}" if reason
-        code = 1
-      end
-
-      puts Usage.scan(__FILE__) if print_usage
-      exit(code)
-    end
-    
     # Version information
     #
     # === Return
     # (String):: Version information
     def version
-      gemspec = eval(File.read(File.join(File.dirname(__FILE__), '..', 'right_link.gemspec')))
-      "rs_shutdown #{gemspec.version} - RightLink's shutdown client (c) 2011 RightScale"
+      "rs_shutdown #{right_link_version} - RightLink's shutdown client (c) 2013 RightScale"
     end
 
-    def succeed
-      exit(0)
+    def usage
+      Usage.scan(__FILE__)
     end
 
   end # ShutdownClient

data/scripts/system_configurator.rb

@@ -1,5 +1,5 @@
 # === Synopsis:
-#   RightScale System Configuration Utility (system) - (c) 2011 RightScale Inc
+#   RightScale System Configuration Utility (system) - (c) 2013 RightScale Inc
 #
 #   This utility performs miscellaneous system configuration tasks.
 #
@@ -24,6 +24,7 @@ require 'right_agent/scripts/common_parser'
 
 # RightLink dependencies
 require File.normalize_path(File.join(File.dirname(__FILE__), '..', 'lib', 'instance', 'agent_config'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'command_helper'))
 
 cloud_dir = RightScale::AgentConfig.cloud_state_dir
 
@@ -41,6 +42,7 @@ end
 
 module RightScale
   class SystemConfigurator
+    include CommandHelper
     RSA_KEY    = File.join(RightScale::Platform.filesystem.ssh_cfg_dir, 'ssh_host_rsa_key')
     DSA_KEY    = File.join(RightScale::Platform.filesystem.ssh_cfg_dir, 'ssh_host_dsa_key')
     SUDO_USER  = 'rightscale'
@@ -109,16 +111,8 @@ module RightScale
         opt :action, "", :type => :string
       end
 
-      begin
+      parse do
         parser.parse
-      rescue Trollop::HelpNeeded
-       puts Usage.scan(__FILE__)
-       exit
-      rescue Trollop::CommandlineError => e
-        puts e.message + "\nUse --help for additional information"
-        exit(1)
-      rescue SystemExit => e
-        raise e
       end
     end