opendev/gerrit
Code Issues Proposed changes

Merge "Require 'Administrate Server' capability to see server summary"

Browse Source
This commit is contained in:
Edwin Kempin
2014-07-04 08:35:52 +00:00
committed by Gerrit Code Review
parent bb495c84fd 4279d4b9c3
commit 2632fb19f5
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java
View File

@@ -23,6 +23,7 @@ import com.google.gerrit.common.Version;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.ConfigResource;
import com.google.gerrit.server.config.ListCaches;
import com.google.gerrit.server.config.ListCaches.CacheInfo;
@@ -100,6 +101,9 @@ final class ShowCaches extends SshCommand {
@Inject
private Provider<ListCaches> listCaches;
@Inject
private Provider<CurrentUser> self;
@Option(name = "--width", aliases = {"-w"}, metaVar = "COLS", usage = "width of output table")
private int columns = 80;
private int nw;
@@ -163,19 +167,21 @@ final class ShowCaches extends SshCommand {
printDiskCaches(caches);
stdout.print('\n');
if (gc) {
System.gc();
System.runFinalization();
System.gc();
}
if (self.get().getCapabilities().canAdministrateServer()) {
if (gc) {
System.gc();
System.runFinalization();
System.gc();
}
sshSummary();
taskSummary();
memSummary();
threadSummary();
sshSummary();
taskSummary();
memSummary();
threadSummary();
if (showJVM) {
jvmSummary();
if (showJVM) {
jvmSummary();
}
}
stdout.flush();