|
@@ -1,12 +1,13 @@
|
1
|
1
|
package com.xxl.job.core.util;
|
2
|
2
|
|
3
|
3
|
import com.xxl.job.core.log.XxlJobLogger;
|
4
|
|
-import org.apache.commons.exec.CommandLine;
|
5
|
|
-import org.apache.commons.exec.DefaultExecutor;
|
6
|
|
-import org.apache.commons.exec.PumpStreamHandler;
|
7
|
4
|
|
8
|
5
|
import java.io.FileOutputStream;
|
9
|
6
|
import java.io.IOException;
|
|
7
|
+import java.io.InputStream;
|
|
8
|
+import java.io.OutputStream;
|
|
9
|
+import java.util.ArrayList;
|
|
10
|
+import java.util.List;
|
10
|
11
|
|
11
|
12
|
/**
|
12
|
13
|
* 1、内嵌编译器如"PythonInterpreter"无法引用扩展包,因此推荐使用java调用控制台进程方式"Runtime.getRuntime().exec()"来运行脚本(shell或python);
|
|
@@ -42,13 +43,143 @@ public class ScriptUtil {
|
42
|
43
|
}
|
43
|
44
|
|
44
|
45
|
/**
|
45
|
|
- * 日志文件输出方式
|
|
46
|
+ * 脚本执行,日志文件实时输出
|
|
47
|
+ *
|
|
48
|
+ * @param command
|
|
49
|
+ * @param scriptFile
|
|
50
|
+ * @param logFile
|
|
51
|
+ * @param params
|
|
52
|
+ * @return
|
|
53
|
+ * @throws IOException
|
|
54
|
+ */
|
|
55
|
+ public static int execToFileB(String command, String scriptFile, String logFile, String... params) throws IOException {
|
|
56
|
+
|
|
57
|
+ FileOutputStream fileOutputStream = null;
|
|
58
|
+ Thread inputThread = null;
|
|
59
|
+ Thread errThread = null;
|
|
60
|
+ try {
|
|
61
|
+ // file
|
|
62
|
+ fileOutputStream = new FileOutputStream(logFile, true);
|
|
63
|
+
|
|
64
|
+ // command
|
|
65
|
+ List<String> cmdarray = new ArrayList<>();
|
|
66
|
+ cmdarray.add(command);
|
|
67
|
+ cmdarray.add(scriptFile);
|
|
68
|
+ if (params!=null && params.length>0) {
|
|
69
|
+ for (String param:params) {
|
|
70
|
+ cmdarray.add(param);
|
|
71
|
+ }
|
|
72
|
+ }
|
|
73
|
+ String[] cmdarrayFinal = cmdarray.toArray(new String[cmdarray.size()]);
|
|
74
|
+
|
|
75
|
+ // process-exec
|
|
76
|
+ final Process process = Runtime.getRuntime().exec(cmdarrayFinal);
|
|
77
|
+
|
|
78
|
+ // log-thread
|
|
79
|
+ final FileOutputStream finalFileOutputStream = fileOutputStream;
|
|
80
|
+ inputThread = new Thread(new Runnable() {
|
|
81
|
+ @Override
|
|
82
|
+ public void run() {
|
|
83
|
+ try {
|
|
84
|
+ copy(process.getInputStream(), finalFileOutputStream, new byte[1024]);
|
|
85
|
+ } catch (IOException e) {
|
|
86
|
+ XxlJobLogger.log(e);
|
|
87
|
+ }
|
|
88
|
+ }
|
|
89
|
+ });
|
|
90
|
+ errThread = new Thread(new Runnable() {
|
|
91
|
+ @Override
|
|
92
|
+ public void run() {
|
|
93
|
+ try {
|
|
94
|
+ copy(process.getErrorStream(), finalFileOutputStream, new byte[1024]);
|
|
95
|
+ } catch (IOException e) {
|
|
96
|
+ XxlJobLogger.log(e);
|
|
97
|
+ }
|
|
98
|
+ }
|
|
99
|
+ });
|
|
100
|
+ inputThread.start();
|
|
101
|
+ errThread.start();
|
|
102
|
+
|
|
103
|
+ // process-wait
|
|
104
|
+ int exitValue = process.waitFor(); // exit code: 0=success, 1=error
|
|
105
|
+
|
|
106
|
+ // log-thread join
|
|
107
|
+ inputThread.join();
|
|
108
|
+ errThread.join();
|
|
109
|
+
|
|
110
|
+ return exitValue;
|
|
111
|
+ } catch (Exception e) {
|
|
112
|
+ XxlJobLogger.log(e);
|
|
113
|
+ return -1;
|
|
114
|
+ } finally {
|
|
115
|
+ if (fileOutputStream != null) {
|
|
116
|
+ try {
|
|
117
|
+ fileOutputStream.close();
|
|
118
|
+ } catch (IOException e) {
|
|
119
|
+ XxlJobLogger.log(e);
|
|
120
|
+ }
|
|
121
|
+
|
|
122
|
+ }
|
|
123
|
+ if (inputThread != null && inputThread.isAlive()) {
|
|
124
|
+ inputThread.interrupt();
|
|
125
|
+ }
|
|
126
|
+ if (errThread != null && errThread.isAlive()) {
|
|
127
|
+ errThread.interrupt();
|
|
128
|
+ }
|
|
129
|
+ }
|
|
130
|
+ }
|
|
131
|
+
|
|
132
|
+ /**
|
|
133
|
+ * 数据流Copy(Input自动关闭,Output不处理)
|
|
134
|
+ *
|
|
135
|
+ * @param inputStream
|
|
136
|
+ * @param outputStream
|
|
137
|
+ * @param buffer
|
|
138
|
+ * @return
|
|
139
|
+ * @throws IOException
|
|
140
|
+ */
|
|
141
|
+ private static long copy(InputStream inputStream, OutputStream outputStream, byte[] buffer) throws IOException {
|
|
142
|
+ try {
|
|
143
|
+ long total = 0;
|
|
144
|
+ for (;;) {
|
|
145
|
+ int res = inputStream.read(buffer);
|
|
146
|
+ if (res == -1) {
|
|
147
|
+ break;
|
|
148
|
+ }
|
|
149
|
+ if (res > 0) {
|
|
150
|
+ total += res;
|
|
151
|
+ if (outputStream != null) {
|
|
152
|
+ outputStream.write(buffer, 0, res);
|
|
153
|
+ }
|
|
154
|
+ }
|
|
155
|
+ }
|
|
156
|
+ outputStream.flush();
|
|
157
|
+ //out = null;
|
|
158
|
+ inputStream.close();
|
|
159
|
+ inputStream = null;
|
|
160
|
+ return total;
|
|
161
|
+ } finally {
|
|
162
|
+ if (inputStream != null) {
|
|
163
|
+ inputStream.close();
|
|
164
|
+ }
|
|
165
|
+ }
|
|
166
|
+ }
|
|
167
|
+
|
|
168
|
+ /**
|
|
169
|
+ * 脚本执行,日志文件实时输出
|
46
|
170
|
*
|
47
|
171
|
* 优点:支持将目标数据实时输出到指定日志文件中去
|
48
|
172
|
* 缺点:
|
49
|
173
|
* 标准输出和错误输出优先级固定,可能和脚本中顺序不一致
|
50
|
174
|
* Java无法实时获取
|
51
|
175
|
*
|
|
176
|
+ * <!-- commons-exec -->
|
|
177
|
+ * <dependency>
|
|
178
|
+ * <groupId>org.apache.commons</groupId>
|
|
179
|
+ * <artifactId>commons-exec</artifactId>
|
|
180
|
+ * <version>${commons-exec.version}</version>
|
|
181
|
+ * </dependency>
|
|
182
|
+ *
|
52
|
183
|
* @param command
|
53
|
184
|
* @param scriptFile
|
54
|
185
|
* @param logFile
|
|
@@ -56,7 +187,7 @@ public class ScriptUtil {
|
56
|
187
|
* @return
|
57
|
188
|
* @throws IOException
|
58
|
189
|
*/
|
59
|
|
- public static int execToFile(String command, String scriptFile, String logFile, String... params) throws IOException {
|
|
190
|
+ /*public static int execToFile(String command, String scriptFile, String logFile, String... params) throws IOException {
|
60
|
191
|
// 标准输出:print (null if watchdog timeout)
|
61
|
192
|
// 错误输出:logging + 异常 (still exists if watchdog timeout)
|
62
|
193
|
// 标准输入
|
|
@@ -92,6 +223,6 @@ public class ScriptUtil {
|
92
|
223
|
|
93
|
224
|
}
|
94
|
225
|
}
|
95
|
|
- }
|
|
226
|
+ }*/
|
96
|
227
|
|
97
|
228
|
}
|