commit 5fa97fcdd051b000dbd71f173e4e6a6c2aad903d
author Edwin Kempin <ekempin@google.com> Wed May 16 15:07:57 2018 +0200
committer David Pursehouse <dpursehouse@collab.net> Thu May 17 10:44:32 2018 +0900
tree df8f08a0be4bce23d999d22110f2a558429fb875
parent 510dc555903874e01dab97581cf14ad7c198a417

GitwebServlet: Write only one log entry for CGI errors

If a separate log statement is written for each line then the entries in
the log file can be interleaved with log entries from other threads,
which makes them less readable.

Change-Id: I038a0d8bc906746cc23b8f3bfb31d6c4d98b53c0
Signed-off-by: Edwin Kempin <ekempin@google.com>

gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
index 8fcb8c6..c5907c9 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
@@ -645,12 +645,17 @@
   private void copyStderrToLog(final InputStream in) {
     new Thread(
             () -> {
+              StringBuilder b = new StringBuilder();
               try (BufferedReader br =
                   new BufferedReader(new InputStreamReader(in, ISO_8859_1.name()))) {
                 String line;
                 while ((line = br.readLine()) != null) {
-                  log.error("CGI: " + line);
+                  if (b.length() > 0) {
+                    b.append('\n');
+                  }
+                  b.append("CGI: ").append(line);
                 }
+                log.error(b.toString());
               } catch (IOException e) {
                 log.error("Unexpected error copying stderr from CGI", e);
               }