Skip to content

Commit

Permalink
ceph-volume process the abspath of the executable first
Browse files Browse the repository at this point in the history
So that it can always log the full path to the executable when it is
logging the 'Running command:' line

Signed-off-by: Alfredo Deza <adeza@redhat.com>
  • Loading branch information
Alfredo Deza committed Mar 12, 2018
1 parent d4eaefe commit 8d4b005
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/ceph-volume/ceph_volume/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ def run(command, **kw):
:param stop_on_error: If a nonzero exit status is return, it raises a ``RuntimeError``
:param fail_msg: If a nonzero exit status is returned this message will be included in the log
"""
executable = which(command.pop(0))
command.insert(0, executable)
stop_on_error = kw.pop('stop_on_error', True)
command_msg = obfuscate(command, kw.pop('obfuscate', None))
fail_msg = kw.pop('fail_msg', None)
executable = which(command.pop(0))
command.insert(0, executable)
logger.info(command_msg)
terminal.write(command_msg)
terminal_logging = kw.pop('terminal_logging', True)
Expand Down Expand Up @@ -174,11 +174,11 @@ def call(command, **kw):
it is forcefully set to True if a return code is non-zero
:param logfile_verbose: Log stderr/stdout output to log file. Defaults to True
"""
executable = which(command.pop(0))
command.insert(0, executable)
terminal_verbose = kw.pop('terminal_verbose', False)
logfile_verbose = kw.pop('logfile_verbose', True)
show_command = kw.pop('show_command', False)
executable = which(command.pop(0))
command.insert(0, executable)
command_msg = "Running command: %s" % ' '.join(command)
stdin = kw.pop('stdin', None)
logger.info(command_msg)
Expand Down

0 comments on commit 8d4b005

Please sign in to comment.