Unverified 提交 548b367c authored 作者: 许雪里's avatar 许雪里 提交者: GitHub

Merge pull request #289 from valinz/script-job-close-logfile

Close log file after script executed
...@@ -59,22 +59,23 @@ public class ScriptUtil { ...@@ -59,22 +59,23 @@ public class ScriptUtil {
// 标准输出:print (null if watchdog timeout) // 标准输出:print (null if watchdog timeout)
// 错误输出:logging + 异常 (still exists if watchdog timeout) // 错误输出:logging + 异常 (still exists if watchdog timeout)
// 标准输入 // 标准输入
FileOutputStream fileOutputStream = new FileOutputStream(logFile, true); try (FileOutputStream fileOutputStream = new FileOutputStream(logFile, true)) {
PumpStreamHandler streamHandler = new PumpStreamHandler(fileOutputStream, fileOutputStream, null); PumpStreamHandler streamHandler = new PumpStreamHandler(fileOutputStream, fileOutputStream, null);
// command // command
CommandLine commandline = new CommandLine(command); CommandLine commandline = new CommandLine(command);
commandline.addArgument(scriptFile); commandline.addArgument(scriptFile);
if (params!=null && params.length>0) { if (params!=null && params.length>0) {
commandline.addArguments(params); commandline.addArguments(params);
} }
// exec // exec
DefaultExecutor exec = new DefaultExecutor(); DefaultExecutor exec = new DefaultExecutor();
exec.setExitValues(null); exec.setExitValues(null);
exec.setStreamHandler(streamHandler); exec.setStreamHandler(streamHandler);
int exitValue = exec.execute(commandline); // exit code: 0=success, 1=error int exitValue = exec.execute(commandline); // exit code: 0=success, 1=error
return exitValue; return exitValue;
}
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论