Commit 3ba5a90b Harvey

no message

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