diff options
Diffstat (limited to 'vespalog/src/main/java/com/yahoo/log')
4 files changed, 20 insertions, 24 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 85d92075827..2cc88855deb 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(); |