diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java index 1938644724..e07f10246c 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java @@ -92,8 +92,8 @@ public class ExecutorController extends BaseController { logger.info("login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, " + "failure policy: {}, node name: {}, node dep: {}, notify type: {}, " + "notify group id: {},receivers:{},receiversCc:{}, run mode: {},process instance priority:{}, workerGroupId: {}, timeout: {}", - loginUser.getUserName(), projectName, processDefinitionId, scheduleTime, failureStrategy, - taskDependType, warningType, warningGroupId,receivers,receiversCc,runMode,processInstancePriority, + loginUser.getUserName(), projectName, processDefinitionId, scheduleTime, + failureStrategy, startNodeList, taskDependType, warningType, warningGroupId,receivers,receiversCc,runMode,processInstancePriority, workerGroupId, timeout); if (timeout == null) { diff --git a/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java b/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java index dff9337ae4..aa88d8e2c5 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java +++ b/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java @@ -344,9 +344,12 @@ public abstract class AbstractZKClient { String parentPath = getZNodeParentPath(zkNodeType); List masterServers = new ArrayList<>(); + int i = 0; for(String path : masterMap.keySet()){ MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(masterMap.get(path)); masterServer.setZkDirectory( parentPath + "/"+ path); + masterServer.setId(i); + i ++; masterServers.add(masterServer); } return masterServers; diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js index 9079b334c1..8e534f9237 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js +++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js @@ -18,6 +18,6 @@ /** * Create file type */ -let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql'] +let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties'] export { filtTypeArr } diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js index 4fcbe832bc..b317d6ff2e 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js +++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js @@ -28,7 +28,8 @@ const handlerSuffix = { '.java': 'textile', '.sql': 'sql', '.hql': 'sql', - '.xml': 'xml' + '.xml': 'xml', + '.properties': 'textile' }