Revert "Resolve username lazily in git over http tasks"
This reverts commit 3fd92a4ac50e5ef49043858ab2576050634a3c2e.
The change was supposed to print the username in the queue for git over
http operations but the username printed is the one of the person doing
show-queue, not the one doing the git operation.
Change-Id: I2f45d526b684af9f3aa336879b310a165048382e
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
index ea92a3c..0f75a09 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
@@ -161,7 +161,6 @@
private final Object lock = new Object();
private boolean done;
private Thread worker;
- private String fullName;
TaskThunk(final WorkQueue.Executor executor, final Continuation cont,
final HttpServletRequest req) {
@@ -220,33 +219,28 @@
@Override
public String toString() {
-
- if (fullName != null) {
- return fullName;
- }
-
- CurrentUser who = user.get();
- if (who.isIdentifiedUser()) {
- String username = who.asIdentifiedUser().getUserName();
- if (username != null && !username.isEmpty()) {
- fullName = name + " (" + username + ")";
- return fullName;
- }
- }
-
return name;
}
private String generateName(HttpServletRequest req) {
+ String userName = "";
+
+ CurrentUser who = user.get();
+ if (who.isIdentifiedUser()) {
+ String name = who.asIdentifiedUser().getUserName();
+ if (name != null && !name.isEmpty()) {
+ userName = " (" + name + ")";
+ }
+ }
String uri = req.getServletPath();
Matcher m = URI_PATTERN.matcher(uri);
if (m.matches()) {
String path = m.group(1);
String cmd = m.group(2);
- return cmd + " " + path;
+ return cmd + " " + path + userName;
} else {
- return req.getMethod() + " " + uri;
+ return req.getMethod() + " " + uri + userName;
}
}
}
