diff options
Diffstat (limited to 'vespalog/src')
5 files changed, 46 insertions, 63 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/LevelController.java b/vespalog/src/main/java/com/yahoo/log/LevelController.java index ccd18f126d6..0efe0d4e7c1 100644 --- a/vespalog/src/main/java/com/yahoo/log/LevelController.java +++ b/vespalog/src/main/java/com/yahoo/log/LevelController.java @@ -1,4 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.log; + +import java.util.logging.Level; + /** * This is the interface for controlling the log level of a * component logger. This hides the actual controlling @@ -7,32 +11,24 @@ * @author arnej27959 * */ - -/** - * @author arnej27959 - **/ -package com.yahoo.log; - -import java.util.logging.Level; - public interface LevelController { /** * should we actually publish a log message with the given Level now? - **/ - public boolean shouldLog(Level level); + */ + boolean shouldLog(Level level); /** * return a string suitable for printing in a logctl file. * the string must be be 4 * 8 characters, where each group * of 4 characters is either " ON" or " OFF". - **/ - public String getOnOffString(); + */ + String getOnOffString(); /** * check the current state of logging and reflect it into the * associated Logger instance, if available. - **/ - public void checkBack(); - public Level getLevelLimit(); + */ + void checkBack(); + Level getLevelLimit(); } diff --git a/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java index f02d8793b23..53f4de4f264 100644 --- a/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java +++ b/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java @@ -13,14 +13,14 @@ import java.util.Map; * @author Ulf Lilleengen * @since 5.1 */ -public class MappedLevelControllerRepo { +class MappedLevelControllerRepo { private final Map<String, LevelController> levelControllerMap = new HashMap<>(); private final MappedByteBuffer mapBuf; private final int controlFileHeaderLength; private final int numLevels; private final String logControlFilename; - public MappedLevelControllerRepo(MappedByteBuffer mapBuf, int controlFileHeaderLength, int numLevels, String logControlFilename) { + MappedLevelControllerRepo(MappedByteBuffer mapBuf, int controlFileHeaderLength, int numLevels, String logControlFilename) { this.mapBuf = mapBuf; this.controlFileHeaderLength = controlFileHeaderLength; this.numLevels = numLevels; @@ -101,12 +101,12 @@ public class MappedLevelControllerRepo { return MappedLevelController.checkOnOff(mapBuf, levstart); } - public LevelController getLevelController(String suffix) { + LevelController getLevelController(String suffix) { return levelControllerMap.get(suffix); } - public void checkBack() { + void checkBack() { for (LevelController ctrl : levelControllerMap.values()) { ctrl.checkBack(); } diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java index 3fe4c50c8e2..86eba1c019e 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java @@ -30,12 +30,12 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { /** * length of fixed header content of a control file, constant: **/ - public static final int controlFileHeaderLength; + static final int controlFileHeaderLength; /** * number of distinctly controlled levels (in logctl files), * must be compatible with C++ Vespa logging **/ - public static final int numLevels = 8; + static final int numLevels = 8; static { controlFileHeaderLength = CFHEADER.length() @@ -50,7 +50,7 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { **/ private LevelController defaultLevelCtrl; - public VespaLevelControllerRepo(String logCtlFn, String logLevel, String applicationPrefix) { + VespaLevelControllerRepo(String logCtlFn, String logLevel, String applicationPrefix) { this.logControlFilename = logCtlFn; this.appPrefix = applicationPrefix; defaultLevelCtrl = new DefaultLevelController(logLevel); @@ -142,7 +142,7 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { levelControllerRepo = new MappedLevelControllerRepo(mapBuf, controlFileHeaderLength, numLevels, logControlFilename); } - public LevelController getLevelControl(String suffix) { + private LevelController getLevelControl(String suffix) { LevelController ctrl = null; if (levelControllerRepo != null) { if (suffix == null || suffix.equals("default")) { diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java index 331780f226b..32b1003c20c 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java @@ -44,7 +44,7 @@ class VespaLogHandler extends StreamHandler { /** * Publish a log record into the Vespa log target. */ - public synchronized void publish (LogRecord record) { + public synchronized void publish(LogRecord record) { Level level = record.getLevel(); String component = record.getLoggerName(); diff --git a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java index c0dd856b634..220e5e9271e 100644 --- a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java +++ b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java @@ -13,6 +13,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import java.util.LinkedList; import java.util.List; import java.util.concurrent.BrokenBarrierException; @@ -32,20 +33,20 @@ import static org.junit.Assert.fail; * @author Bjorn Borud */ public class VespaLogHandlerTestCase { - protected static String hostname; - protected static String pid; + private static String hostname; + private static String pid; - protected static LogRecord record1; - protected static String record1String; + static LogRecord record1; + static String record1String; - protected static LogRecord record2; - protected static String record2String; + static LogRecord record2; + private static String record2String; - protected static LogRecord record3; - protected static String record3String; + private static LogRecord record3; + private static String record3String; - protected static LogRecord record4; - protected static String record4String; + private static LogRecord record4; + private static String record4String; static { hostname = Util.getHostName(); @@ -139,7 +140,7 @@ public class VespaLogHandlerTestCase { } @Test - public void testFallback() throws FileNotFoundException { + public void testFallback() { File file = new File("mydir2"); file.delete(); assertTrue(file.mkdir()); @@ -157,7 +158,7 @@ public class VespaLogHandlerTestCase { * Perform simple test */ @Test - public void testLogCtl () throws InterruptedException, FileNotFoundException { + public void testLogCtl () { MockLevelController ctl = new MockLevelController(); MockLevelControllerRepo ctlRepo = new MockLevelControllerRepo(ctl); MockLogTarget target = new MockLogTarget(); @@ -203,7 +204,7 @@ public class VespaLogHandlerTestCase { @Test public void testRotate () throws IOException { // Doesn't work in Windows. TODO: Fix the logging stuff - if (System.getProperty("os.name").toLowerCase().indexOf("win")>=0) + if (System.getProperty("os.name").toLowerCase().contains("win")) return; try { VespaLogHandler h @@ -269,10 +270,8 @@ public class VespaLogHandlerTestCase { ); class LogRacer implements Runnable { - private int n; - public LogRacer (int n) { - this.n = n; + private LogRacer() { } public void run () { @@ -285,7 +284,7 @@ public class VespaLogHandlerTestCase { } } - public void logLikeCrazy () { + void logLikeCrazy() { for (int j = 0; j < numLogEntries; j++) { try { h.publish(record1); @@ -299,7 +298,7 @@ public class VespaLogHandlerTestCase { } for (int i = 0; i < numThreads; i++) { - t[i] = new Thread(new LogRacer(i)); + t[i] = new Thread(new LogRacer()); t[i].start(); } @@ -361,35 +360,23 @@ public class VespaLogHandlerTestCase { * */ protected static String[] readFile (String fileName) { - BufferedReader br = null; - List<String> lines = new LinkedList<String>(); - try { - br = new BufferedReader( - new InputStreamReader(new FileInputStream(new File(fileName)), "UTF-8")); + List<String> lines = new LinkedList<>(); + try (BufferedReader br = new BufferedReader( + new InputStreamReader(new FileInputStream(new File(fileName)), StandardCharsets.UTF_8))) { for (String line = br.readLine(); line != null; - line = br.readLine()) - { + line = br.readLine()) { lines.add(line); } - return lines.toArray(new String[lines.size()]); - } - catch (Throwable e) { + return lines.toArray(new String[0]); + } catch (Throwable e) { return new String[0]; } - finally { - if (br != null) { - try { - br.close(); - } - catch (IOException e) {} - } - } } private static class MockLevelControllerRepo implements LevelControllerRepo { private LevelController levelController; - public MockLevelControllerRepo(LevelController controller) { + MockLevelControllerRepo(LevelController controller) { this.levelController = controller; } @@ -411,7 +398,7 @@ public class VespaLogHandlerTestCase { return (level.equals(logLevel)); } - public void setShouldLog(Level level) { + void setShouldLog(Level level) { this.logLevel = level; } @@ -431,7 +418,7 @@ public class VespaLogHandlerTestCase { private static class MockLogTarget implements LogTarget { private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - public String[] getLines() { + String[] getLines() { return baos.toString().split("\n"); } @Override |