Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
5b9da215
Commit
5b9da215
authored
Mar 25, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决脚本运行不通知异常的BUG
parent
7f690086
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
20 deletions
+25
-20
WaitingRecordServiceImpl.java
.../java/com/byit/service/impl/WaitingRecordServiceImpl.java
+1
-1
ScriptExecutorJobTask.java
...re/src/main/java/com/byit/task/ScriptExecutorJobTask.java
+3
-3
ScriptExecutorServiceImpl.java
...main/java/com/byit/service/ScriptExecutorServiceImpl.java
+20
-15
AddComplexPy.java
...-demo-client/src/main/java/com/byit/job/AddComplexPy.java
+1
-1
No files found.
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/WaitingRecordServiceImpl.java
View file @
5b9da215
...
...
@@ -32,7 +32,7 @@ public class WaitingRecordServiceImpl implements WaitingRecordService {
*/
@Override
public
List
<
WaitingRecord
>
findAllByTriggerTime
(
long
triggerTime
)
{
log
.
info
(
"------查询对应的等待工作流--------"
);
log
.
debug
(
"------查询对应的等待工作流--------"
);
return
waitingRecordMapper
.
findAllByTriggerTime
(
triggerTime
);
}
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java
View file @
5b9da215
...
...
@@ -29,7 +29,7 @@ import java.util.Date;
public
class
ScriptExecutorJobTask
implements
TimerTask
{
private
final
String
HTTP_PRE
=
"http://"
;
private
final
String
HTTP_SUFFIX
=
"/job/callbackRes"
;
private
final
String
HTTP_SUFFIX
=
"/
myth-job-admin/
job/callbackRes"
;
private
JobTaskSchedule
mythJobTaskSchedule
;
...
...
@@ -101,16 +101,16 @@ public class ScriptExecutorJobTask implements TimerTask {
try
{
dispatchResponseDto
=
runScriptService
.
runScript
(
scriptDto
);
}
catch
(
RpcException
rpcException
){
log
.
error
(
"------执行机异常{}-----"
,
rpcException
.
getMessage
());
dispatchResponseDto
.
setMsg
(
rpcException
.
getMessage
());
dispatchResponseDto
.
setCode
(
JobResultEnum
.
DISPATCH_FAIL
.
getRes
());
log
.
error
(
"--------------执行机不存在----------------"
);
}
saveLog
(
mythJobTaskSchedule
,
dispatchResponseDto
);
}
private
void
saveLog
(
JobTaskSchedule
mythJobTaskSchedule
,
DispatchResponseDto
dispatchResponseDto
){
log
.
info
(
"-----------saveLog--保存脚本调度日志开始------------"
);
log
.
debug
(
"-----------saveLog--保存脚本调度日志开始------------"
);
JobTaskRunLogServiceImpl
jobTaskRunLogService
=
SpringUtil
.
getBean
(
JobTaskRunLogServiceImpl
.
class
);
JobTaskRunLogWithBLOBs
jobTaskRunLogById
=
jobTaskRunLogService
.
findJobTaskRunLogById
(
mythJobTaskSchedule
.
getLogId
());
...
...
byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java
View file @
5b9da215
...
...
@@ -54,9 +54,29 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
@Override
public
DispatchResponseDto
runPythonScript
(
ScriptDto
scriptDto
)
{
log
.
info
(
"----------------runPythonScript start{} ------------------------"
,
scriptDto
);
DispatchResponseDto
dispatchResponseDto
;
try
{
RunThreadPool
.
SCRIPT_RUN_THREAD_POOL
.
execute
(()->{
startScript
(
scriptDto
);
});
dispatchResponseDto
=
DispatchResponseDto
.
builder
()
.
code
(
JobResultEnum
.
DISPATCH_SUCCESS
.
getCode
())
.
msg
(
JobResultEnum
.
DISPATCH_SUCCESS
.
getMsg
())
.
build
();
}
catch
(
Exception
e
){
dispatchResponseDto
=
DispatchResponseDto
.
builder
()
.
code
(
JobResultEnum
.
DISPATCH_FAIL
.
getCode
())
.
msg
(
JobResultEnum
.
DISPATCH_FAIL
.
getMsg
())
.
build
();
}
dispatchResponseDto
.
setUrl
(
ServiceInfoUtil
.
getIpAndPort
());
log
.
info
(
"----------------runPythonScript end---------------------"
);
return
dispatchResponseDto
;
}
public
void
startScript
(
ScriptDto
scriptDto
){
log
.
info
(
"--------------runPythonScript,脚本调用开始-----------"
);
//创建回复对象
JobRunResultDto
jobRunResultDto
=
new
JobRunResultDto
();
...
...
@@ -121,21 +141,6 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
jobRunResultDto
.
setLogRemotelyPath
(
logPath
);
cn
.
hutool
.
http
.
HttpUtil
.
post
(
callbackUrl
,
JSON
.
toJSONString
(
jobRunResultDto
));
log
.
info
(
"--------------runPythonScript,脚本调用结束-----------"
);
});
dispatchResponseDto
=
DispatchResponseDto
.
builder
()
.
code
(
JobResultEnum
.
DISPATCH_SUCCESS
.
getCode
())
.
msg
(
JobResultEnum
.
DISPATCH_SUCCESS
.
getMsg
())
.
build
();
}
catch
(
Exception
e
){
dispatchResponseDto
=
DispatchResponseDto
.
builder
()
.
code
(
JobResultEnum
.
DISPATCH_FAIL
.
getCode
())
.
msg
(
JobResultEnum
.
DISPATCH_FAIL
.
getMsg
())
.
build
();
}
dispatchResponseDto
.
setUrl
(
ServiceInfoUtil
.
getIpAndPort
());
return
dispatchResponseDto
;
}
...
...
demo-client/byit-demo-client/src/main/java/com/byit/job/AddComplexPy.java
View file @
5b9da215
...
...
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
public
class
AddComplexPy
{
public
static
void
main
(
String
[]
args
)
{
RunNode
runNode
=
new
RunNode
();
runNode
.
setScriptUrl
(
"ddmp/M00/00/0
0/CgB4Al5wa36AaUJ7AAAAiYy1k-k980
1.py"
);
runNode
.
setScriptUrl
(
"ddmp/M00/00/0
1/CgB4Al5wa6WAfhQ9AAAAN9Xm1mU122
1.py"
);
runNode
.
setJobType
(
"PYTHON"
);
runNode
.
setNodeId
(
"2"
);
runNode
.
setNodeName
(
"lijkki"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment