Merge pull request #1243 from MrAnno/debug-only-location-infos

java-modules: report location information only when 'loglevel <= DEBUG'
syslog-ng · Oct 26, 2016 · 123809d · 123809d
2 parents f8746df + 4f236c4
commit 123809d
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/modules/java-modules/common/src/main/java/org/syslog_ng/logging/SyslogNgInternalLogger.java b/modules/java-modules/common/src/main/java/org/syslog_ng/logging/SyslogNgInternalLogger.java
@@ -38,7 +38,6 @@ public static void register(Logger logger) {
         if (logger.getAppender(SyslogNgInternalLogger.NAME) == null) {
             logger.removeAllAppenders();
             logger.addAppender(new SyslogNgInternalLogger());
-            logger.setLevel(Level.DEBUG);
         }
     }
 
@@ -58,15 +57,24 @@ public boolean requiresLayout() {
 
     @Override
     protected void append(LoggingEvent event) {
-        StringBuilder formatedMessage = new StringBuilder();
-        formatedMessage.append(event.getLocationInformation().getClassName());
-        formatedMessage.append(".");
-        formatedMessage.append(event.getLocationInformation().getMethodName());
-        formatedMessage.append(":");
-        formatedMessage.append(event.getLocationInformation().getLineNumber());
-        formatedMessage.append(" - ");
-        formatedMessage.append(event.getMessage().toString());
-        String message = formatedMessage.toString();
+
+        String message = null;
+        String internalMessageBody = event.getMessage().toString();
+
+        if (event.getLevel().isGreaterOrEqual(Level.INFO)) {
+            message = internalMessageBody;
+        }
+        else {
+            StringBuilder formatedMessage = new StringBuilder();
+            formatedMessage.append(event.getLocationInformation().getClassName());
+            formatedMessage.append(".");
+            formatedMessage.append(event.getLocationInformation().getMethodName());
+            formatedMessage.append(":");
+            formatedMessage.append(event.getLocationInformation().getLineNumber());
+            formatedMessage.append(" - ");
+            formatedMessage.append(internalMessageBody);
+            message = formatedMessage.toString();
+        }
 
         switch(event.getLevel().toInt()) {
         case Level.INFO_INT: