Browse Source

update AlertGroupService, extends from BaseService, remove duplicate methods (#1091)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message

* delete before check to avoid KeeperException$NoNodeException

* fix the message

* check processInstance state before delete tenant

* check processInstance state before delete worker group

* refactor

* merge api constants into common constatns

* update the resource perm

* update the dataSource perm

* fix CheckUtils.checkUserParams method

* update AlertGroupService, extends from BaseService, remove duplicate methods
pull/2/head
Tboy 5 years ago committed by bao liang
parent
commit
8bf83ba9ad
  1. 27
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java

27
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java

@ -44,7 +44,7 @@ import java.util.Map;
* alert group service
*/
@Service
public class AlertGroupService {
public class AlertGroupService extends BaseService{
private static final Logger logger = LoggerFactory.getLogger(AlertGroupService.class);
@ -269,29 +269,4 @@ public class AlertGroupService {
return result;
}
/**
* is admin?
* @param loginUser
* @param result
* @return
*/
private boolean checkAdmin(User loginUser, Map<String, Object> result) {
if (!isAdmin(loginUser)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return true;
}
return false;
}
/**
* put message
*
* @param result
* @param status
*/
private void putMsg(Map<String, Object> result, Status status) {
result.put(Constants.STATUS, status);
result.put(Constants.MSG, status.getMsg());
}
}

Loading…
Cancel
Save