Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
68d0c974
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
68d0c974
编写于
4月 12, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update stauts and QueueService
上级
11117f27
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
18 deletion
+18
-18
escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
...ler-api/src/main/java/cn/escheduler/api/enums/Status.java
+2
-2
escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java
...src/main/java/cn/escheduler/api/service/QueueService.java
+16
-16
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java
浏览文件 @
68d0c974
...
...
@@ -151,10 +151,10 @@ public enum Status {
SCHEDULE_CRON_REALEASE_NEED_NOT_CHANGE
(
10126
,
"schedule release is already {0}"
),
CREATE_QUEUE_ERROR
(
10127
,
"create queue error"
),
QUEUE_NOT_EXIST
(
10128
,
"queue {0} not exists"
),
QUEUE_
EXIST
(
10129
,
"que
ue {0} already exists"
),
QUEUE_
VALUE_EXIST
(
10129
,
"queue val
ue {0} already exists"
),
QUEUE_NAME_EXIST
(
10130
,
"queue name {0} already exists"
),
UPDATE_QUEUE_ERROR
(
10131
,
"update queue error"
),
NEED_NOT_UPDATE_QUEUE
(
10132
,
"n
eed not update queue
"
),
NEED_NOT_UPDATE_QUEUE
(
10132
,
"n
o content changes, no updates are required
"
),
VERIFY_QUEUE_ERROR
(
10133
,
"verify queue error"
),
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java
浏览文件 @
68d0c974
...
...
@@ -117,13 +117,13 @@ public class QueueService extends BaseService {
return
result
;
}
if
(
checkQueue
Exist
(
queu
e
))
{
putMsg
(
result
,
Status
.
QUEUE_
EXIST
,
queu
e
);
if
(
checkQueue
NameExist
(
queueNam
e
))
{
putMsg
(
result
,
Status
.
QUEUE_
NAME_EXIST
,
queueNam
e
);
return
result
;
}
if
(
checkQueue
NameExist
(
queueNam
e
))
{
putMsg
(
result
,
Status
.
QUEUE_
NAME_EXIST
,
queueNam
e
);
if
(
checkQueue
Exist
(
queu
e
))
{
putMsg
(
result
,
Status
.
QUEUE_
VALUE_EXIST
,
queu
e
);
return
result
;
}
...
...
@@ -162,24 +162,24 @@ public class QueueService extends BaseService {
return
result
;
}
// whether queue
and
queueName is changed
// whether queue
value or
queueName is changed
if
(
queue
.
equals
(
queueObj
.
getQueue
())
&&
queueName
.
equals
(
queueObj
.
getQueueName
()))
{
putMsg
(
result
,
Status
.
NEED_NOT_UPDATE_QUEUE
);
return
result
;
}
// check queue is exist
if
(!
queue
.
equals
(
queueObj
.
getQueu
e
()))
{
if
(
checkQueue
Exist
(
queu
e
)){
putMsg
(
result
,
Status
.
QUEUE_
EXIST
,
queu
e
);
// check queue
name
is exist
if
(!
queue
Name
.
equals
(
queueObj
.
getQueueNam
e
()))
{
if
(
checkQueue
NameExist
(
queueNam
e
)){
putMsg
(
result
,
Status
.
QUEUE_
NAME_EXIST
,
queueNam
e
);
return
result
;
}
}
// check queue
Nam
e is exist
if
(!
queue
Name
.
equals
(
queueObj
.
getQueueNam
e
()))
{
if
(
checkQueue
NameExist
(
queueNam
e
)){
putMsg
(
result
,
Status
.
QUEUE_
NAME_EXIST
,
queueNam
e
);
// check queue
valu
e is exist
if
(!
queue
.
equals
(
queueObj
.
getQueu
e
()))
{
if
(
checkQueue
Exist
(
queu
e
)){
putMsg
(
result
,
Status
.
QUEUE_
VALUE_EXIST
,
queu
e
);
return
result
;
}
}
...
...
@@ -216,13 +216,13 @@ public class QueueService extends BaseService {
return
result
;
}
if
(
checkQueueExist
(
queue
)){
logger
.
error
(
"queue {} has exist, can't create again."
,
queue
);
putMsg
(
result
,
Status
.
QUEUE_EXIST
,
queue
);
logger
.
error
(
"queue
value
{} has exist, can't create again."
,
queue
);
putMsg
(
result
,
Status
.
QUEUE_
VALUE_
EXIST
,
queue
);
return
result
;
}
if
(
checkQueueNameExist
(
queueName
)){
logger
.
error
(
"queue
N
ame {} has exist, can't create again."
,
queueName
);
logger
.
error
(
"queue
n
ame {} has exist, can't create again."
,
queueName
);
putMsg
(
result
,
Status
.
QUEUE_NAME_EXIST
,
queueName
);
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录