Merge pull request #1221 from chef/ssd/no-log-pw

Don't log rabbitmq password during migration 1.31
chef · Apr 7, 2017 · d9eea8c · d9eea8c
2 parents 954e17e + 1db7040
commit d9eea8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/omnibus/files/private-chef-upgrades/001/031_migrate_rabbitmq_password.rb b/omnibus/files/private-chef-upgrades/001/031_migrate_rabbitmq_password.rb
@@ -11,7 +11,8 @@
       [rmq["management_user"], "management_password"]
     ].each do |name, passname|
       pass = Partybus.config.secrets.get('rabbitmq', passname)
-      run_command("/opt/opscode/embedded/bin/rabbitmqctl change_password #{name} #{pass}")
+      run_command("/opt/opscode/embedded/bin/rabbitmqctl change_password #{name} #{pass}",
+                  log_msg: "rabbitmq password upgrade for user #{name}")
     end
 
     stop_services(["rabbitmq"])

diff --git a/omnibus/partybus/lib/partybus/migration_api/v1.rb b/omnibus/partybus/lib/partybus/migration_api/v1.rb
@@ -92,7 +92,8 @@ def stop_services(service_array)
       end
 
       def run_command(command, options={})
-        log("\tRunning Command: #{command} with options #{options.inspect}")
+        log_msg = options[:log_msg] || "Running Command: #{command} with options #{options.inspect}"
+        log("\t#{log_msg}")
         runner = Partybus::CommandRunner.new
         runner.run_command(command, options)
       end