diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-01 13:40:29 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-01 13:40:29 +0200 |
commit | 862ae2913bc269f612f920d18ee930537fc3df22 (patch) | |
tree | f24873339d1d9e99cf59f1e2e0e8bfd81f7f33f8 | |
parent | ddef97ad50de48ef3ad17f490cfe4fb80fcf9723 (diff) |
Clean up some code to improve code health during random code read.
4 files changed, 18 insertions, 24 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java index 1a0dbac7de9..364420796d3 100644 --- a/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java +++ b/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java @@ -14,10 +14,10 @@ public interface LevelControllerRepo { * @param component The component name string. * @return The LevelController corresponding to that component. Return null if not found. */ - public LevelController getLevelController(String component); + LevelController getLevelController(String component); /** * Close down the level controller repository. Cleanup should be done here. */ - public void close(); + void close(); } diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java index 72a80227138..482d7049079 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java @@ -39,13 +39,14 @@ public class VespaFormatter extends SimpleFormatter { } private String serviceName; - private String componentPrefix; + private final String componentPrefix; /** * Default constructor */ public VespaFormatter() { this.serviceName = serviceNameUnsetValue; + this.componentPrefix = null; } /** @@ -193,9 +194,6 @@ public class VespaFormatter extends SimpleFormatter { String message = t.getMessage(); if (t.getCause() == null) { if (message == null) return t.getClass().getSimpleName(); - } else { - if (message == null) return null; - //if (message.equals(t.getCause().getClass().getName() + ": " + t.getCause().getMessage())) return null; } return message; } diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java index d47f78521a2..85d92075827 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java @@ -49,13 +49,11 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { * or logging without a logcontrol file) **/ private LevelController defaultLevelCtrl; - private String defaultLogLevel; public VespaLevelControllerRepo(String logCtlFn, String logLevel, String applicationPrefix) { this.logControlFilename = logCtlFn; - this.defaultLogLevel = logLevel; this.appPrefix = applicationPrefix; - defaultLevelCtrl = new DefaultLevelController(defaultLogLevel); + defaultLevelCtrl = new DefaultLevelController(logLevel); openCtlFile(); } @@ -158,7 +156,7 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { if (ctlFile == null) { return defaultLevelCtrl; } - LevelController inherit = null; + LevelController inherit; int lastdot = suffix.lastIndexOf('.'); if (lastdot != -1) { @@ -173,18 +171,18 @@ public class VespaLevelControllerRepo implements LevelControllerRepo { } try { long len = ctlFile.length(); - String append; + StringBuilder sb = new StringBuilder(); if (suffix.equals("")) { - append = "default" + ": "; + sb.append("default: "); } else { - append = "." + suffix + ": "; + sb.append(".").append(suffix).append(": "); } - while ((len + append.length()) % 4 != 0) { - append = append + " "; + while ((len + sb.length()) % 4 != 0) { + sb.append(" "); } - append = append + inherit.getOnOffString() + "\n"; + sb.append(inherit.getOnOffString()).append("\n"); ctlFile.seek(ctlFile.length()); - ctlFile.writeBytes(append); + ctlFile.writeBytes(sb.toString()); extendMapping(); ctrl = levelControllerRepo.getLevelController(suffix); } catch(java.nio.channels.ClosedByInterruptException e) { diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java index 336e9e06cb3..7eede7e1e35 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java @@ -31,7 +31,7 @@ class VespaLogHandler extends StreamHandler { * <DD> Log to specified file in append mode * </DL> */ - public VespaLogHandler(LogTarget logTarget, + VespaLogHandler(LogTarget logTarget, LevelControllerRepo levelControllerRepo, String serviceName, String applicationPrefix) { this.logTarget = logTarget; @@ -62,8 +62,7 @@ class VespaLogHandler extends StreamHandler { // provokes rotation of target setOutputStream(logTarget.open()); } catch (RuntimeException e) { - LogRecord r = new LogRecord(Level.SEVERE, - "Unable to open file target"); + LogRecord r = new LogRecord(Level.SEVERE, "Unable to open file target"); r.setThrown(e); emergencyLog(r); setOutputStream(System.err); @@ -73,7 +72,7 @@ class VespaLogHandler extends StreamHandler { closeFileTarget(); } - public LevelController getLevelControl(String component) { + LevelController getLevelControl(String component) { return repo.getLevelController(component); } @@ -96,8 +95,7 @@ class VespaLogHandler extends StreamHandler { emergencyLog(r); } catch (RuntimeException e) { - LogRecord r = new LogRecord(Level.SEVERE, - "Unable to open file target"); + LogRecord r = new LogRecord(Level.SEVERE, "Unable to open file target"); r.setThrown(e); emergencyLog(r); setOutputStream(System.err); @@ -106,7 +104,7 @@ class VespaLogHandler extends StreamHandler { /** Closes the target log file, if there is one */ - public void closeFileTarget() { + synchronized void closeFileTarget() { try { logTarget.close(); } |