diff --git a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java index 63d9f10e5a..753c0669d0 100644 --- a/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java +++ b/dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java @@ -94,7 +94,8 @@ public class LoggerRequestProcessor implements NettyRequestProcessor { channel.writeAndFlush(viewLogResponse.convert2Command(command.getOpaque())); break; case ROLL_VIEW_LOG_REQUEST: - RollViewLogRequestCommand rollViewLogRequest = JSONUtils.parseObject(command.getBody(), RollViewLogRequestCommand.class); + RollViewLogRequestCommand rollViewLogRequest = + JSONUtils.parseObject(command.getBody(), RollViewLogRequestCommand.class); // todo: solve the NPE, this shouldn't happen in normal case RollViewLogResponseCommand rollViewLogRequestResponse = readPartFileContent(rollViewLogRequest); channel.writeAndFlush(rollViewLogRequestResponse.convert2Command(command.getOpaque())); @@ -187,7 +188,7 @@ public class LoggerRequestProcessor implements NettyRequestProcessor { return RollViewLogResponseCommand.error(RollViewLogResponseCommand.Status.LOG_PATH_IS_NOT_SECURITY); } File file = new File(rollViewLogPath); - if (!file.exists() || file.isFile()) { + if (!file.exists() || !file.isFile()) { logger.error("Log file path: {} doesn't exists", rollViewLogPath); return RollViewLogResponseCommand.error(RollViewLogResponseCommand.Status.LOG_FILE_NOT_FOUND); } diff --git a/dolphinscheduler-ui-next/node/node b/dolphinscheduler-ui-next/node/node deleted file mode 100755 index 4341f32e77..0000000000 Binary files a/dolphinscheduler-ui-next/node/node and /dev/null differ diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml index 3df1a01dc2..16bda241c8 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -32,6 +32,7 @@ v16.13.1 v6.32.6 src + 1.12.1