opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  [GitwebServlet] Use logger built-in formatting
  [GitwebServlet] Avoid empty error flooding the logs

Change-Id: I98f4161d88e3c895c22f8b559fc7a356b56d50f3
This commit is contained in:
David Pursehouse 2018-06-20 19:35:06 +09:00
parent 0c5e61333f 943341d2a1
commit d5ceaf81a5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -131,7 +132,7 @@ class GitwebServlet extends HttpServlet {
try {
uri = new URI(url);
} catch (URISyntaxException e) {
log.error("Invalid gitweb.url: " + url);
log.error("Invalid gitweb.url: {}", url);
}
gitwebUrl = uri;
} else {
@ -510,7 +511,7 @@ class GitwebServlet extends HttpServlet {
final int status = proc.exitValue();
if (0 != status) {
log.error("Non-zero exit status (" + status + ") from " + gitwebCgi);
log.error("Non-zero exit status ({}) from {}", status, gitwebCgi);
if (!rsp.isCommitted()) {
rsp.sendError(500);
}
@ -653,17 +654,17 @@ class GitwebServlet extends HttpServlet {
private void copyStderrToLog(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) {
if (b.length() > 0) {
b.append('\n');
}
b.append("CGI: ").append(line);
String err =
br.lines()
.filter(s -> !s.isEmpty())
.map(s -> "CGI: " + s)
.collect(Collectors.joining("\n"))
.trim();
if (!err.isEmpty()) {
log.error(err);
}
log.error(b.toString());
} catch (IOException e) {
log.error("Unexpected error copying stderr from CGI", e);
}