opendev/gerrit
Code Issues Proposed changes

Don't log command line caused failures in flush-caches

Browse Source 
If this is a user caused error, we don't need it in our server logs.

Change-Id: I95b41d1d3bc4d5b2433718eca891acfaa394301c
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-08-28 15:54:05 -07:00
parent 9da49e446e
commit 0c2143054c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/google/gerrit/server/ssh/commands/AdminFlushCaches.java
View File

@@ -54,14 +54,14 @@ final class AdminFlushCaches extends CacheCommand {
p = toPrintWriter(err);
if (list) {
if (all || caches.size() > 0) {
throw new Failure(1, "error: cannot use --list with --all or --cache");
throw error("error: cannot use --list with --all or --cache");
}
doList();
return;
}
if (all && caches.size() > 0) {
throw new Failure(1, "error: cannot combine --all and --cache");
throw error("error: cannot combine --all and --cache");
} else if (!all && caches.size() == 1 && caches.contains("all")) {
caches.clear();
all = true;
@@ -72,12 +72,16 @@ final class AdminFlushCaches extends CacheCommand {
final SortedSet<String> names = cacheNames();
for (final String n : caches) {
if (!names.contains(n)) {
throw new Failure(1, "error: cache \"" + n + "\" not recognized");
throw error("error: cache \"" + n + "\" not recognized");
}
}
doBulkFlush();
}
private static UnloggedFailure error(final String msg) {
return new UnloggedFailure(1, msg);
}
private void doList() {
for (final String name : cacheNames()) {
p.print(name);