Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
d5c795bd
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
d5c795bd
编写于
3月 05, 2020
作者:
Q
qiaozhanwei
提交者:
GitHub
3月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix ugly logger usage (#2063)
* fix ugly logger usage * remove space
上级
3e5a9399
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
10 addition
and
10 deletion
+10
-10
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java
...lphinscheduler/api/controller/DataAnalysisController.java
+2
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
...e/dolphinscheduler/api/controller/ExecutorController.java
+1
-1
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
...g/apache/dolphinscheduler/remote/NettyRemotingServer.java
+1
-1
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
...e/dolphinscheduler/remote/handler/NettyClientHandler.java
+1
-1
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
...e/dolphinscheduler/remote/handler/NettyServerHandler.java
+1
-1
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
...lphinscheduler/server/master/runner/MasterExecThread.java
+1
-1
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
...ache/dolphinscheduler/service/process/ProcessService.java
+3
-3
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java
浏览文件 @
d5c795bd
...
...
@@ -103,7 +103,7 @@ public class DataAnalysisController extends BaseController{
@RequestParam
(
value
=
"endDate"
,
required
=
false
)
String
endDate
,
@RequestParam
(
value
=
"projectId"
,
required
=
false
,
defaultValue
=
"0"
)
int
projectId
){
try
{
logger
.
info
(
"count process instance state, user:{}, start date: {}, end date:{}, project id"
,
logger
.
info
(
"count process instance state, user:{}, start date: {}, end date:{}, project id
:{}
"
,
loginUser
.
getUserName
(),
startDate
,
endDate
,
projectId
);
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countProcessInstanceStateByProject
(
loginUser
,
projectId
,
startDate
,
endDate
);
return
returnDataList
(
result
);
...
...
@@ -129,7 +129,7 @@ public class DataAnalysisController extends BaseController{
public
Result
countDefinitionByUser
(
@ApiIgnore
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
value
=
"projectId"
,
required
=
false
,
defaultValue
=
"0"
)
int
projectId
){
try
{
logger
.
info
(
"count process definition , user:{}, project id"
,
logger
.
info
(
"count process definition , user:{}, project id
:{}
"
,
loginUser
.
getUserName
(),
projectId
);
Map
<
String
,
Object
>
result
=
dataAnalysisService
.
countDefinitionByUser
(
loginUser
,
projectId
);
return
returnDataList
(
result
);
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
浏览文件 @
d5c795bd
...
...
@@ -173,7 +173,7 @@ public class ExecutorController extends BaseController {
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
startCheckProcessDefinition
(
@ApiIgnore
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
value
=
"processDefinitionId"
)
int
processDefinitionId
)
{
logger
.
info
(
"login user {}, check process definition"
,
loginUser
.
getUserName
(),
processDefinitionId
);
logger
.
info
(
"login user {}, check process definition
{}
"
,
loginUser
.
getUserName
(),
processDefinitionId
);
try
{
Map
<
String
,
Object
>
result
=
execService
.
startCheckByProcessDefinedId
(
processDefinitionId
);
return
returnDataList
(
result
);
...
...
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
浏览文件 @
d5c795bd
...
...
@@ -145,7 +145,7 @@ public class NettyRemotingServer {
try
{
future
=
serverBootstrap
.
bind
(
serverConfig
.
getListenPort
()).
sync
();
}
catch
(
Exception
e
)
{
logger
.
error
(
"NettyRemotingServer bind fail {}, exit"
,
e
);
logger
.
error
(
"NettyRemotingServer bind fail {}, exit"
,
e
.
getMessage
(),
e
);
throw
new
RuntimeException
(
String
.
format
(
"NettyRemotingServer bind %s fail"
,
serverConfig
.
getListenPort
()));
}
if
(
future
.
isSuccess
())
{
...
...
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
浏览文件 @
d5c795bd
...
...
@@ -107,7 +107,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
*/
@Override
public
void
exceptionCaught
(
ChannelHandlerContext
ctx
,
Throwable
cause
)
throws
Exception
{
logger
.
error
(
"exceptionCaught : {}"
,
cause
);
logger
.
error
(
"exceptionCaught : {}"
,
cause
.
getMessage
(),
cause
);
nettyRemotingClient
.
closeChannel
(
ChannelUtils
.
toAddress
(
ctx
.
channel
()));
ctx
.
channel
().
close
();
}
...
...
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
浏览文件 @
d5c795bd
...
...
@@ -140,7 +140,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
*/
@Override
public
void
exceptionCaught
(
ChannelHandlerContext
ctx
,
Throwable
cause
)
throws
Exception
{
logger
.
error
(
"exceptionCaught : {}"
,
cause
);
logger
.
error
(
"exceptionCaught : {}"
,
cause
.
getMessage
(),
cause
);
ctx
.
channel
().
close
();
}
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
浏览文件 @
d5c795bd
...
...
@@ -565,7 +565,7 @@ public class MasterExecThread implements Runnable {
TaskInstance
taskInstance
=
completeTaskList
.
get
(
nodeName
);
if
(
taskInstance
==
null
){
logger
.
error
(
"task instance cannot find, please check it!"
,
nodeName
);
logger
.
error
(
"task instance
{}
cannot find, please check it!"
,
nodeName
);
return
conditionTaskList
;
}
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
浏览文件 @
d5c795bd
...
...
@@ -116,12 +116,12 @@ public class ProcessService {
ProcessInstance
processInstance
=
constructProcessInstance
(
command
,
host
);
//cannot construct process instance, return null;
if
(
processInstance
==
null
){
logger
.
error
(
"scan command, command parameter is error:
%s"
,
command
.
toString
()
);
logger
.
error
(
"scan command, command parameter is error:
{}"
,
command
);
moveToErrorCommand
(
command
,
"process instance is null"
);
return
null
;
}
if
(!
checkThreadNum
(
command
,
validThreadNum
)){
logger
.
info
(
"there is not enough thread for this command: {}"
,
command
.
toString
()
);
logger
.
info
(
"there is not enough thread for this command: {}"
,
command
);
return
setWaitingThreadProcess
(
command
,
processInstance
);
}
processInstance
.
setCommandType
(
command
.
getCommandType
());
...
...
@@ -991,7 +991,7 @@ public class ProcessService {
return
insertQueueResult
;
}
catch
(
Exception
e
){
logger
.
error
(
"submit task to queue Exception: "
,
e
);
logger
.
error
(
"task queue error :
%s
"
,
JSONUtils
.
toJson
(
taskInstance
));
logger
.
error
(
"task queue error :
{}
"
,
JSONUtils
.
toJson
(
taskInstance
));
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录