package org.onap.vid.controller;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.File;
import java.io.IOException;
import java.util.List;
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;
this.logfilePathCreator = logfilePathCreator;
}
- @GetMapping(value = "/{loggerName:audit|error|metrics}")
+ @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 {
}
String logfilePath = logfilePathCreator.getLogfilePath(loggerName);
- try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath))) {
+ 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)