hejianchao commented on a change in pull request #11542: [FLINK-16303][rest] Enable retrieval of custom JobManager log files URL: https://github.com/apache/flink/pull/11542#discussion_r399292170
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandler.java ########## @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.runtime.rest.handler.cluster; + +import org.apache.flink.api.common.time.Time; +import org.apache.flink.runtime.rest.handler.HandlerRequest; +import org.apache.flink.runtime.rest.handler.RestHandlerException; +import org.apache.flink.runtime.rest.messages.EmptyRequestBody; +import org.apache.flink.runtime.rest.messages.UntypedResponseMessageHeaders; +import org.apache.flink.runtime.rest.messages.cluster.FileMessageParameters; +import org.apache.flink.runtime.rest.messages.taskmanager.LogFileNamePathParameter; +import org.apache.flink.runtime.webmonitor.RestfulGateway; +import org.apache.flink.runtime.webmonitor.WebMonitorUtils; +import org.apache.flink.runtime.webmonitor.retriever.GatewayRetriever; +import org.apache.flink.util.StringUtils; + +import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus; + +import java.io.File; +import java.util.Map; +import java.util.concurrent.CompletionException; + +/** + * Rest handler which serves the custom log file from JobManager. + */ +public class JobManagerCustomLogHandler extends AbstractJobManagerFileHandler<FileMessageParameters> { + + public JobManagerCustomLogHandler( + GatewayRetriever<? extends RestfulGateway> leaderRetriever, + Time timeout, Map<String, String> responseHeaders, + UntypedResponseMessageHeaders<EmptyRequestBody, FileMessageParameters> messageHeaders, + WebMonitorUtils.LogFileLocation logFileLocation) { + super(leaderRetriever, timeout, responseHeaders, messageHeaders, logFileLocation); + } + + @Override + protected File getFile(HandlerRequest<EmptyRequestBody, FileMessageParameters> handlerRequest) { + final String logDir = logFileLocation.logFile.getParent(); + if (logFileLocation.logFile == null || StringUtils.isNullOrWhitespaceOnly(logFileLocation.logFile.getParent())) { Review comment: If `logFileLocation.logFile == null`, then the line above will throw NPE. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
