From c795a64c843856ea1e5a9f84f89cfb1bfae06d64 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 6 Dec 2010 13:58:34 +0000 Subject: [PATCH] [MRM-1440] add a system status page Merged from: r1042625:1042631 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1042646 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/action/admin/SystemStatusAction.java | 114 ++++++++++++++++++ .../src/main/resources/struts.xml | 4 + .../webapp/WEB-INF/jsp/admin/systemStatus.jsp | 85 +++++++++++++ .../webapp/WEB-INF/jsp/decorators/default.jsp | 3 + 4 files changed, 206 insertions(+) create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java new file mode 100644 index 000000000..9334fd405 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SystemStatusAction.java @@ -0,0 +1,114 @@ +package org.apache.maven.archiva.web.action.admin; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import com.opensymphony.xwork2.Preparable; +import org.apache.maven.archiva.configuration.ArchivaConfiguration; +import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.maven.archiva.configuration.functors.RepositoryConfigurationComparator; +import org.apache.maven.archiva.database.ArchivaDAO; +import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics; +import org.apache.maven.archiva.model.RepositoryContentStatistics; +import org.apache.maven.archiva.repository.scanner.RepositoryScanner; +import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; +import org.apache.maven.archiva.web.util.ContextUtils; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.codehaus.plexus.cache.Cache; +import org.codehaus.plexus.redback.rbac.Resource; +import org.codehaus.plexus.taskqueue.TaskQueue; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; + +/** + * Shows system status information for the administrator. + * + * @version $Id$ + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="systemStatus" instantiation-strategy="per-lookup" + */ +public class SystemStatusAction + extends PlexusActionSupport + implements SecureAction +{ + /** + * @plexus.requirement role="org.codehaus.plexus.taskqueue.TaskQueue" + */ + private Map queues; + + /** + * @plexus.requirement role="org.codehaus.plexus.cache.Cache" + */ + private Map caches; + + private String memoryStatus; + + public SecureActionBundle getSecureActionBundle() + throws SecureActionException + { + SecureActionBundle bundle = new SecureActionBundle(); + + bundle.setRequiresAuthentication( true ); + bundle.addRequiredAuthorization( ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION, Resource.GLOBAL ); + + return bundle; + } + + public String execute() + { + Runtime runtime = Runtime.getRuntime(); + runtime.gc(); + long total = runtime.totalMemory(); + long used = total - runtime.freeMemory(); + long max = runtime.maxMemory(); + memoryStatus = formatMemory(used) + "/" + formatMemory(total) + " (Max: " + formatMemory(max) + ")"; + + return SUCCESS; + } + + private static String formatMemory( long l ) + { + return l / ( 1024 * 1024 ) + "M"; + } + + public String getMemoryStatus() + { + return memoryStatus; + } + + public Map getCaches() + { + return caches; + } + + public Map getQueues() + { + return queues; + } +} diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml index 434310a11..a640fe6ff 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml @@ -479,6 +479,10 @@ + + /WEB-INF/jsp/admin/systemStatus.jsp + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp new file mode 100644 index 000000000..438aa4d4e --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp @@ -0,0 +1,85 @@ +<%-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --%> + +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + + + + Administration - System Status + + + + + +

Administration - System Status

+ +
+ + + + +

Queues

+ + + + + + + + + + + + + +
QueueSize
${queueEntry.key}${fn:length(queue)}
+ +

Caches

+ + + + + + + + + + + + + + + + + + + + +
CacheSizeHitsMissesHit Ratio 
${cacheEntry.key}${cacheEntry.value.statistics.size}${cacheEntry.value.statistics.cacheHits}${cacheEntry.value.statistics.cacheMiss}Flush
+ +

Memory

+ +

${memoryStatus}

+ + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index 7a7df7a1c..60fce63e0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -146,6 +146,9 @@
  • Repository Scanning +
    • +
  • + System Status
    • <%-- TODO: future options here. * Repository Syncing Connectors. (rsync, ftp, scp, etc...) -- 2.39.5