+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed 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.
+ * ============LICENSE_END=========================================================
+ */
+
package org.onap.vid.controller;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.FileAppender;
-import ch.qos.logback.core.spi.AppenderAttachable;
-import org.apache.commons.io.input.ReversedLinesFileReader;
-import org.apache.commons.lang3.StringUtils;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.vid.model.ExceptionResponse;
-import org.onap.vid.roles.Role;
-import org.onap.vid.roles.RoleProvider;
-import org.onap.vid.utils.Streams;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.NotAuthorizedException;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
-import static com.att.eelf.configuration.Configuration.GENERAL_LOGGER_NAME;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.NotAuthorizedException;
+import org.apache.commons.io.input.ReversedLinesFileReader;
+import org.apache.commons.lang3.StringUtils;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.vid.model.ExceptionResponse;
+import org.onap.vid.roles.Role;
+import org.onap.vid.roles.RoleProvider;
+import org.onap.vid.utils.Streams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
@RestController
public class LoggerController extends RestrictedBaseController {
private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(LoggerController.class);
+ public static final String VID_IS_STARTED = "VID is started";
+ private RoleProvider roleProvider;
+ private LogfilePathCreator logfilePathCreator;
@Autowired
- RoleProvider roleProvider;
+ public LoggerController(RoleProvider roleProvider, LogfilePathCreator logfilePathCreator) {
+ this.roleProvider = roleProvider;
+ this.logfilePathCreator = logfilePathCreator;
+ }
- @RequestMapping(value = "/{loggerName:audit|error|metrics}", method = RequestMethod.GET)
+ @GetMapping(value = "/{loggerName:audit|audit2019|error|metrics|metrics2019}")
public String getLog(@PathVariable String loggerName, HttpServletRequest request,
@RequestParam(value="limit", defaultValue = "5000") Integer limit) throws IOException {
throw new NotAuthorizedException("User not authorized to get logs");
}
- String logfilePath = getLogfilePath(loggerName);
-
- try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath))) {
+ String logfilePath = logfilePathCreator.getLogfilePath(loggerName);
+ try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath), UTF_8)) {
Supplier<String> reverseLinesSupplier = () -> {
try {
return reader.readLine();
return Streams.takeWhile(
Stream.generate(reverseLinesSupplier),
- line -> !StringUtils.contains(line, "Logging is started"))
+ line -> !StringUtils.contains(line, "Logging is started") &&
+ !StringUtils.contains(line, VID_IS_STARTED))
.limit(limit)
.limit(5_000)
.filter(Objects::nonNull)
}
}
- private String getLogfilePath(String loggerName) {
- /*
- Find the requested logger, and pull all of it's appenders.
- Find the first of the appenders that is a FileAppender, and return it's
- write-out filename.
- */
- LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
- return context.getLoggerList().stream()
- .filter(logger -> logger.getName().equals(GENERAL_LOGGER_NAME + "." + loggerName))
- .flatMap(this::pullSubAppenders)
- .flatMap(appender -> {
- // Appender might be "attachable", if so - roll-up its sub-appenders
- return (appender instanceof AppenderAttachable) ?
- pullSubAppenders((AppenderAttachable<?>) appender) : Stream.of(appender);
- })
- .filter(appender -> appender instanceof FileAppender)
- .map(appender -> (FileAppender<?>) appender)
- .map(FileAppender::getFile)
- .findFirst()
- .orElseThrow(() -> new InternalServerErrorException("logfile for " + loggerName + " not found"));
- }
-
- private <T> Stream<Appender<T>> pullSubAppenders(AppenderAttachable<T> logger) {
- return Streams.fromIterator(logger.iteratorForAppenders());
- }
-
@ExceptionHandler({ NotAuthorizedException.class })
@ResponseStatus(HttpStatus.UNAUTHORIZED)
public String notAuthorizedHandler(NotAuthorizedException e) {
@ExceptionHandler({ IOException.class, InternalServerErrorException.class })
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
public ExceptionResponse ioExceptionHandler(Exception e) {
- return org.onap.vid.controller.ControllersUtils.handleException(e, LOGGER);
+ return ControllersUtils.handleException(e, LOGGER);
}
}
Code Review / vid.git / blobdiff