提交 c531c88e 编写于 作者: G gabry.wu 提交者: qiaozhanwei

[Feature] AbstractCommandExecutor.commandType difficult to understand (#1833)

issue: https://github.com/apache/incubator-dolphinscheduler/issues/1831
上级 c558da0b
...@@ -207,7 +207,7 @@ public abstract class AbstractCommandExecutor { ...@@ -207,7 +207,7 @@ public abstract class AbstractCommandExecutor {
// merge error information to standard output stream // merge error information to standard output stream
processBuilder.redirectErrorStream(true); processBuilder.redirectErrorStream(true);
// setting up user to run commands // setting up user to run commands
processBuilder.command("sudo", "-u", tenantCode, commandType(), commandFile); processBuilder.command("sudo", "-u", tenantCode, commandInterpreter(), commandFile);
process = processBuilder.start(); process = processBuilder.start();
...@@ -561,7 +561,7 @@ public abstract class AbstractCommandExecutor { ...@@ -561,7 +561,7 @@ public abstract class AbstractCommandExecutor {
protected abstract String buildCommandFilePath(); protected abstract String buildCommandFilePath();
protected abstract String commandType(); protected abstract String commandInterpreter();
protected abstract boolean checkFindApp(String line); protected abstract boolean checkFindApp(String line);
protected abstract void createCommandFileIfNotExists(String execCommand, String commandFile) throws IOException; protected abstract void createCommandFileIfNotExists(String execCommand, String commandFile) throws IOException;
} }
...@@ -113,7 +113,7 @@ public class PythonCommandExecutor extends AbstractCommandExecutor { ...@@ -113,7 +113,7 @@ public class PythonCommandExecutor extends AbstractCommandExecutor {
* @return python home * @return python home
*/ */
@Override @Override
protected String commandType() { protected String commandInterpreter() {
String pythonHome = getPythonHome(envFile); String pythonHome = getPythonHome(envFile);
if (StringUtils.isEmpty(pythonHome)){ if (StringUtils.isEmpty(pythonHome)){
return PYTHON; return PYTHON;
......
...@@ -74,7 +74,7 @@ public class ShellCommandExecutor extends AbstractCommandExecutor { ...@@ -74,7 +74,7 @@ public class ShellCommandExecutor extends AbstractCommandExecutor {
* @return command type * @return command type
*/ */
@Override @Override
protected String commandType() { protected String commandInterpreter() {
return SH; return SH;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册