Commit 3ba5a90b Harvey

no message

1 个父辈 bc3d4ad1
...@@ -28,12 +28,8 @@ const batchJob = [ ...@@ -28,12 +28,8 @@ const batchJob = [
[ [
"demoJobHandler1", "demoJobHandler1",
async (args) => { async (args) => {
for (let i = 1; i < 10; i++) { console.log(JSON.stringify(args));
await new Promise((resolve, reject) => { throw new Error('error test');
setTimeout(resolve, 888);
});
}
return { result: 'return value' };
} }
], ],
[ [
......
...@@ -39,7 +39,7 @@ class JobManager { ...@@ -39,7 +39,7 @@ class JobManager {
error: new Error('任务执行超时') error: new Error('任务执行超时')
}), executorTimeout * 1000); }), executorTimeout * 1000);
} }
result = await jobHandler(jobParams); result = await jobHandler(jobParams.args);
if (result && result.error) { if (result && result.error) {
error = result.error; error = result.error;
delete result.error; delete result.error;
...@@ -47,6 +47,9 @@ class JobManager { ...@@ -47,6 +47,9 @@ class JobManager {
result = undefined; result = undefined;
} }
} }
if (jobParams.allowRet == false) {
result = undefined;
}
} }
catch (err) { catch (err) {
error = err; error = err;
......
...@@ -3,7 +3,7 @@ import { JobExecutor } from "./index"; ...@@ -3,7 +3,7 @@ import { JobExecutor } from "./index";
import * as path from "path"; import * as path from "path";
const config = { const config = {
appType:'express', appType: 'express',
appDomain: "http://10.0.1.92:17001/", appDomain: "http://10.0.1.92:17001/",
port: 8088, port: 8088,
xxlJob: { xxlJob: {
...@@ -34,16 +34,11 @@ const batchJob = [ ...@@ -34,16 +34,11 @@ const batchJob = [
[ [
"demoJobHandler1", "demoJobHandler1",
async (args) => { async (args) => {
for (let i = 1; i < 10; i++) { console.log(JSON.stringify(args))
await new Promise((resolve, reject) => { throw new Error('error test')
setTimeout(resolve, 888);
})
}
return { result: 'return value' };
} }
], ],
[ [
"demoJobHandler2", "demoJobHandler2",
async (args) => { async (args) => {
for (let i = 1; i < 10; i++) { for (let i = 1; i < 10; i++) {
......
...@@ -82,7 +82,7 @@ export class JobManager { ...@@ -82,7 +82,7 @@ export class JobManager {
this.runningJobs.add(jobId); this.runningJobs.add(jobId);
// 解析任务参数 // 解析任务参数
let jobParams = {}; let jobParams: any = {};
try { try {
jobParams = JSON.parse(jobJsonParams) || {}; jobParams = JSON.parse(jobJsonParams) || {};
} catch { } } catch { }
...@@ -104,7 +104,7 @@ export class JobManager { ...@@ -104,7 +104,7 @@ export class JobManager {
} }
// 执行任务处理函数 // 执行任务处理函数
result = await jobHandler(jobParams); result = await jobHandler(jobParams.args);
// 处理可能存在的错误结果 // 处理可能存在的错误结果
if (result && result.error) { if (result && result.error) {
...@@ -115,6 +115,11 @@ export class JobManager { ...@@ -115,6 +115,11 @@ export class JobManager {
} }
} }
// 检查任务是否允许返回
if (jobParams.allowRet == false) {
result = undefined;
}
} catch (err) { } catch (err) {
error = err; error = err;
} finally { } finally {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!