From: Olivier Lamy Date: Mon, 12 Mar 2012 10:58:48 +0000 (+0000) Subject: [MRM-1580] system status page display memory usage. X-Git-Tag: archiva-1.4-M3~1061 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec23b663697b7e1076ad9042c6cdf93356a60788;p=archiva.git [MRM-1580] system status page display memory usage. missed to add new classes git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299621 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java new file mode 100644 index 000000000..6942d69a2 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SystemStatusService.java @@ -0,0 +1,43 @@ +package org.apache.archiva.rest.api.services; +/* + * 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 org.apache.archiva.security.common.ArchivaRoleConstants; +import org.codehaus.plexus.redback.authorization.RedbackAuthorization; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@Path( "/systemStatusService/" ) +public interface SystemStatusService +{ + @Path( "memoryStatus" ) + @GET + @Produces( MediaType.TEXT_PLAIN ) + @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + String getMemoryStatus() + throws ArchivaRestServiceException; + +} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java new file mode 100644 index 000000000..27e70439f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java @@ -0,0 +1,48 @@ +package org.apache.archiva.rest.services; +/* + * 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 org.apache.archiva.rest.api.services.ArchivaRestServiceException; +import org.apache.archiva.rest.api.services.SystemStatusService; +import org.springframework.stereotype.Service; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@Service("systemStatusService#rest") +public class DefaultSystemStatusService + implements SystemStatusService +{ + public String getMemoryStatus() + throws ArchivaRestServiceException + { + Runtime runtime = Runtime.getRuntime(); + runtime.gc(); + long total = runtime.totalMemory(); + long used = total - runtime.freeMemory(); + long max = runtime.maxMemory(); + return formatMemory( used ) + "/" + formatMemory( total ) + " (Max: " + formatMemory( max ) + ")"; + } + + private static String formatMemory( long l ) + { + return l / ( 1024 * 1024 ) + "M"; + } +}