Skip to content

Commit a617571

Browse files
committed
Remove unused _passwordCommand flag from Script class to simplify code
1 parent 64a6547 commit a617571

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

utils/src/main/java/com/cloud/utils/script/Script.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public class Script implements Callable<String> {
6666
private static final int DEFAULT_TIMEOUT = 3600 * 1000; /* 1 hour */
6767
private volatile boolean _isTimeOut = false;
6868

69-
private boolean _passwordCommand = false;
7069
private boolean avoidLoggingCommand = false;
7170
private final Set<Integer> sensitiveArgIndices = new HashSet<>();
7271

@@ -178,7 +177,6 @@ protected String buildCommandLine(String[] command) {
178177

179178
if ("-y".equals(cmd) || "-z".equals(cmd)) {
180179
obscureParam = true;
181-
_passwordCommand = true;
182180
}
183181
}
184182
return builder.toString();
@@ -340,12 +338,8 @@ public String execute(OutputInterpreter interpreter) {
340338
_logger.trace(String.format("Running timed out task of process [%s] for command [%s].", processPid,
341339
commandLine));
342340
timedoutTask.run();
343-
if (_passwordCommand) {
344-
_logger.warn(String.format("Process [%s] for command [%s] timed out.", processPid, commandLine));
345-
} else {
346-
_logger.warn(String.format("Process [%s] for command [%s] timed out. Output is [%s].", processPid,
341+
_logger.warn(String.format("Process [%s] for command [%s] timed out. Output is [%s].", processPid,
347342
commandLine, timedoutTask.getResult()));
348-
}
349343

350344
return ERR_TIMEOUT;
351345
}

0 commit comments

Comments
 (0)