aboutsummaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-10-11 10:05:04 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-10-11 10:05:04 +0200
commit0862204e36bc4e47be69480c63bb2980bda88e7a (patch)
tree17bda39f30a19a5bac8fb53a2d654ffcba2b74a6 /vespalog
parentb682654c786a94dc7dd564f4bc1047e1ed06500c (diff)
Nonfunctional changes only
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/main/java/com/yahoo/log/LogSetup.java4
-rw-r--r--vespalog/src/main/java/com/yahoo/log/VespaFormat.java3
-rw-r--r--vespalog/src/main/java/com/yahoo/log/VespaFormatter.java5
-rw-r--r--vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java5
4 files changed, 7 insertions, 10 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
index 12b1411b17e..1bdefaa52fd 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
@@ -82,7 +82,7 @@ public class LogSetup {
String logControlDir = System.getProperty("vespa.log.control.dir");
String logControlFile = System.getProperty("vespa.log.control.file");
if (programName == null || programName.equals("")) {
- throw new RuntimeException("invalid programName: "+programName);
+ throw new RuntimeException("invalid programName: " + programName);
}
// then try environment values
@@ -165,6 +165,7 @@ public class LogSetup {
* For other log records, isLoggable returns true
*/
static class ZooKeeperFilter implements Filter {
+
private FileHandler fileHandler;
ZooKeeperFilter(String logFile) {
@@ -180,6 +181,7 @@ public class LogSetup {
/**
* Return true if loggable (ordinary log record), returns false if this filter
* logs it itself
+ *
* @param record a #{@link LogRecord}
* @return true if loggable, false otherwise
*/
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
index d0dc5607af5..90e16f6408e 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
@@ -48,8 +48,7 @@ public class VespaFormat {
* value was "(empty)".
*
* @param s String that might need escaping
- * @return Returns escaped string
- *
+ * @return returns the escaped string
*/
public static String escape (String s) {
if (s == null) {
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
index 482d7049079..314e0ae49e6 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
@@ -92,9 +92,7 @@ public class VespaFormatter extends SimpleFormatter {
public String format(LogRecord r) {
StringBuilder sbuf = new StringBuilder(300); // initial guess
- String levelName = LogLevel.getVespaLogLevel(r.getLevel())
- .toString()
- .toLowerCase();
+ String levelName = LogLevel.getVespaLogLevel(r.getLevel()).toString().toLowerCase();
String component = r.getLoggerName();
@@ -130,7 +128,6 @@ public class VespaFormatter extends SimpleFormatter {
}
appendException(r.getThrown(), sbuf);
-
sbuf.append("\n");
return sbuf.toString();
}
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
index 7eede7e1e35..331780f226b 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
@@ -7,7 +7,7 @@ import java.util.logging.LogRecord;
import java.util.logging.StreamHandler;
/**
- * @author Bjorn Borud
+ * @author Bjorn Borud
* @author arnej27959
*/
class VespaLogHandler extends StreamHandler {
@@ -32,8 +32,7 @@ class VespaLogHandler extends StreamHandler {
* </DL>
*/
VespaLogHandler(LogTarget logTarget,
- LevelControllerRepo levelControllerRepo, String serviceName,
- String applicationPrefix) {
+ LevelControllerRepo levelControllerRepo, String serviceName, String applicationPrefix) {
this.logTarget = logTarget;
this.serviceName = serviceName;
this.appPrefix = applicationPrefix;