natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix view log bug (#149)

This commit is contained in:
Wenjun Ruan 2022-09-17 21:18:34 +08:00 committed by GitHub
parent bc1495f2a0
commit 34217ffe5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dolphinscheduler-log-server/src/main/java/org/apache/dolphinscheduler/server/log/LoggerRequestProcessor.java
View File

@ -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);
}

BIN
dolphinscheduler-ui-next/node/node
View File

Binary file not shown.

1
dolphinscheduler-ui/pom.xml
View File

@ -32,6 +32,7 @@
<node.version>v16.13.1</node.version>
<pnpm.version>v6.32.6</pnpm.version>
<sonar.sources>src</sonar.sources>
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
</properties>
<profiles>