|
|
@@ -1,49 +1,57 @@
|
|
|
package com.xxl.job.core.util;
|
|
|
|
|
|
+import com.xxl.job.core.log.XxlJobFileAppender;
|
|
|
import org.apache.commons.exec.CommandLine;
|
|
|
import org.apache.commons.exec.DefaultExecutor;
|
|
|
import org.apache.commons.exec.PumpStreamHandler;
|
|
|
|
|
|
import java.io.File;
|
|
|
import java.io.FileOutputStream;
|
|
|
+import java.io.IOException;
|
|
|
|
|
|
/**
|
|
|
* 1、内嵌编译器如"PythonInterpreter"无法引用扩展包，因此推荐使用java调用控制台进程方式"Runtime.getRuntime().exec()"来运行脚本(shell或python)；
|
|
|
* 2、因为通过java调用控制台进程方式实现，需要保证目标机器PATH路径正确配置对应编译器；
|
|
|
* 3、暂时脚本执行日志只能在脚本执行结束后一次性获取，无法保证实时性；因此为确保日志实时性，可改为将脚本打印的日志存储在指定的日志文件上；
|
|
|
- *
|
|
|
- * 知识点：
|
|
|
- * 1、日志输出到日志文件：[>>logfile 2>&1]：将错误输出2以及标准输出1都一起以附加写方式导入logfile文件
|
|
|
- * 2、python 异常输出优先级高于标准输出，体现在Log文件中，因此推荐通过logging方式打日志保持和异常信息一致；否则用prinf日志顺序会错乱
|
|
|
+ * 4、python 异常输出优先级高于标准输出，体现在Log文件中，因此推荐通过logging方式打日志保持和异常信息一致；否则用prinf日志顺序会错乱
|
|
|
*
|
|
|
* Created by xuxueli on 17/2/25.
|
|
|
*/
|
|
|
public class ScriptUtil {
|
|
|
|
|
|
- private static String pyCmd = "python";
|
|
|
- private static String shllCmd = "bash";
|
|
|
- private static String pyFile = "/Users/xuxueli/workspaces/idea-git-workspace/github/xxl-incubator/xxl-util/src/main/resources/script/pytest.py";
|
|
|
- private static String shellFile = "/Users/xuxueli/workspaces/idea-git-workspace/github/xxl-incubator/xxl-util/src/main/resources/script/shelltest.sh";
|
|
|
- private static String pyLogFile = "/Users/xuxueli/Downloads/tmp/pylog.log";
|
|
|
- private static String shLogFile = "/Users/xuxueli/Downloads/tmp/shlog.log";
|
|
|
-
|
|
|
- public static void main(String[] args) {
|
|
|
-
|
|
|
- String command = pyCmd;
|
|
|
- String filename = pyFile;
|
|
|
- String logFile = pyLogFile;
|
|
|
- if (false) {
|
|
|
- command = shllCmd;
|
|
|
- filename = shellFile;
|
|
|
- logFile = shLogFile;
|
|
|
+ /**
|
|
|
+ * make script file
|
|
|
+ *
|
|
|
+ * @param scriptFileName
|
|
|
+ * @param content
|
|
|
+ * @throws IOException
|
|
|
+ */
|
|
|
+ public static void markScriptFile(String scriptFileName, String content) throws IOException {
|
|
|
+ // filePath/
|
|
|
+ File filePathDir = new File(XxlJobFileAppender.filePath);
|
|
|
+ if (!filePathDir.exists()) {
|
|
|
+ filePathDir.mkdirs();
|
|
|
}
|
|
|
|
|
|
- execToFile(command, filename, logFile);
|
|
|
-
|
|
|
- }
|
|
|
+ // filePath/gluesource/
|
|
|
+ File filePathSourceDir = new File(filePathDir, "gluesource");
|
|
|
+ if (!filePathSourceDir.exists()) {
|
|
|
+ filePathSourceDir.mkdirs();
|
|
|
+ }
|
|
|
|
|
|
- public static File markScriptFile(){
|
|
|
- return null;
|
|
|
+ // make file, filePath/gluesource/666-123456789.py
|
|
|
+ FileOutputStream fileOutputStream = null;
|
|
|
+ try {
|
|
|
+ fileOutputStream = new FileOutputStream(scriptFileName);
|
|
|
+ fileOutputStream.write(content.getBytes("UTF-8"));
|
|
|
+ fileOutputStream.close();
|
|
|
+ } catch (Exception e) {
|
|
|
+ throw e;
|
|
|
+ }finally{
|
|
|
+ if(fileOutputStream != null){
|
|
|
+ fileOutputStream.close();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -58,29 +66,22 @@ public class ScriptUtil {
|
|
|
* @param scriptFile
|
|
|
* @param logFile
|
|
|
*/
|
|
|
- public static void execToFile(String command, String scriptFile, String logFile){
|
|
|
- try {
|
|
|
- // 标准输出：print （null if watchdog timeout）
|
|
|
- // 错误输出：logging + 异常 （still exists if watchdog timeout）
|
|
|
- // 标准输出
|
|
|
- FileOutputStream fileOutputStream = new FileOutputStream(logFile);
|
|
|
- PumpStreamHandler streamHandler = new PumpStreamHandler(fileOutputStream, fileOutputStream, null);
|
|
|
+ public static void execToFile(String command, String scriptFile, String logFile) throws IOException {
|
|
|
+ // 标准输出：print （null if watchdog timeout）
|
|
|
+ // 错误输出：logging + 异常 （still exists if watchdog timeout）
|
|
|
+ // 标准输入
|
|
|
+ FileOutputStream fileOutputStream = new FileOutputStream(logFile, true);
|
|
|
+ PumpStreamHandler streamHandler = new PumpStreamHandler(fileOutputStream, fileOutputStream, null);
|
|
|
|
|
|
- // command
|
|
|
- CommandLine commandline = new CommandLine(command);
|
|
|
- commandline.addArgument(scriptFile);
|
|
|
+ // command
|
|
|
+ CommandLine commandline = new CommandLine(command);
|
|
|
+ commandline.addArgument(scriptFile);
|
|
|
|
|
|
- // exec
|
|
|
- DefaultExecutor exec = new DefaultExecutor();
|
|
|
- exec.setExitValues(null);
|
|
|
- exec.setStreamHandler(streamHandler);
|
|
|
- int exitValue = exec.execute(commandline);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- /*Process process = Runtime.getRuntime().exec(cmdarray);
|
|
|
- IOUtils.copy(process.getInputStream(), out);
|
|
|
- IOUtils.copy(process.getErrorStream(), out);*/
|
|
|
+ // exec
|
|
|
+ DefaultExecutor exec = new DefaultExecutor();
|
|
|
+ exec.setExitValues(null);
|
|
|
+ exec.setStreamHandler(streamHandler);
|
|
|
+ int exitValue = exec.execute(commandline);
|
|
|
}
|
|
|
|
|
|
}
|
xueli.xue