Merge pull request #17656 from iterate-ch/feature/MD-25811-transcript

Log headers at debug level

Author: dkocher

core/dylib/src/main/java/ch/cyberduck/core/logging/UnifiedSystemLogTranscriptListener.java

@@ -23,11 +23,6 @@ public class UnifiedSystemLogTranscriptListener implements TranscriptListener {
 
     @Override
     public void log(final Type type, final String message) {
-        switch(type) {
-            case request:
-            case response:
-                appender.log(UnifiedSystemLogAppender.OS_LOG_TYPE_INFO, "transcript", message);
-                break;
-        }
+        appender.log(UnifiedSystemLogAppender.OS_LOG_TYPE_INFO, "transcript", message);
     }
 }

core/src/main/java/ch/cyberduck/core/LoggingTranscriptListener.java

@@ -19,27 +19,17 @@
 import org.apache.logging.log4j.Logger;
 
 public class LoggingTranscriptListener implements TranscriptListener {
-
-    private final Logger request;
-    private final Logger response;
-
-    public LoggingTranscriptListener() {
-        this(LogManager.getLogger("ch.cyberduck.transcript.request"), LogManager.getLogger("ch.cyberduck.transcript.response"));
-    }
-
-    public LoggingTranscriptListener(final Logger request, final Logger response) {
-        this.request = request;
-        this.response = response;
-    }
+    private static final Logger log = LogManager.getLogger("transcript");
 
     @Override
     public void log(final Type type, final String message) {
         switch(type) {
-            case request:
-                request.info(message);
+            case requestheader:
+            case responseheader:
+                log.debug(message);
                 break;
-            case response:
-                response.info(message);
+            default:
+                log.info(message);
                 break;
         }
     }

core/src/main/java/ch/cyberduck/core/TranscriptListener.java

@@ -22,7 +22,9 @@ public interface TranscriptListener {
 
     enum Type {
         request,
-        response
+        requestheader,
+        response,
+        responseheader
     }
 
     /**

core/src/main/java/ch/cyberduck/core/http/CustomHttpRequestExecutor.java

@@ -77,11 +77,11 @@ protected HttpResponse doSendRequest(final HttpRequest request, final HttpClient
                     case "X-Auth-Key":
                     case "X-Auth-Token":
                     case "X-FilesAPI-Key":
-                        listener.log(TranscriptListener.Type.request, String.format("%s: %s", header.getName(),
+                        listener.log(TranscriptListener.Type.requestheader, String.format("%s: %s", header.getName(),
                                 StringUtils.repeat("*", Integer.min(8, StringUtils.length(header.getValue())))));
                         break;
                     default:
-                        listener.log(TranscriptListener.Type.request, header.toString());
+                        listener.log(TranscriptListener.Type.requestheader, header.toString());
                         break;
                 }
             }
@@ -126,7 +126,7 @@ private void log(final HttpResponse response) {
         synchronized(listener) {
             listener.log(TranscriptListener.Type.response, response.getStatusLine().toString());
             for(Header header : response.getAllHeaders()) {
-                listener.log(TranscriptListener.Type.response, header.toString());
+                listener.log(TranscriptListener.Type.responseheader, header.toString());
             }
         }
     }

ftp/src/main/java/ch/cyberduck/core/ftp/LoggingProtocolCommandListener.java

@@ -38,7 +38,7 @@ public void protocolCommandSent(final ProtocolCommandEvent event) {
         final String message = StringUtils.chomp(event.getMessage());
         if(message.startsWith(FTPCmd.PASS.name())) {
             this.log(Type.request, String.format("%s %s", FTPCmd.PASS.name(),
-                    StringUtils.repeat("*", StringUtils.length(StringUtils.removeStart(message, FTPCmd.PASS.name())))));
+                    StringUtils.repeat("*", Integer.min(8, StringUtils.length(StringUtils.removeStart(message, FTPCmd.PASS.name()))))));
         }
         else {
             this.log(Type.request, message);