From 4d109b1521c1f6e09f007aeacbb319443c45dfc8 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 6 Jun 2011 13:37:16 +0530 Subject: Design changes - introducing cluster-server mapping on gateway --- .../gluster/storage/management/client/VolumesClient.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/com.gluster.storage.management.client') diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java index 4ab21a01..43435675 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java @@ -120,8 +120,8 @@ public class VolumesClient extends AbstractClient { * * @param volumeName * Name of volume whose logs are to be fetched - * @param diskName - * Name of the disk whose logs are to be fetched. Pass ALL to fetch log messages from all disks of the + * @param brickName + * Name of the brick whose logs are to be fetched. Pass ALL to fetch log messages from all bricks of the * volume. * @param severity * Log severity {@link GlusterConstants#VOLUME_LOG_LEVELS_ARR}. Pass ALL to fetch log messages of all @@ -134,9 +134,9 @@ public class VolumesClient extends AbstractClient { * Number of most recent log messages to be fetched (from each disk) * @return Log Message List response received from the Gluster Management Server. */ - public LogMessageListResponse getLogs(String volumeName, String diskName, String severity, Date fromTimestamp, + public LogMessageListResponse getLogs(String volumeName, String brickName, String severity, Date fromTimestamp, Date toTimestamp, int messageCount) { - MultivaluedMap queryParams = prepareGetLogQueryParams(diskName, severity, fromTimestamp, + MultivaluedMap queryParams = prepareGetLogQueryParams(brickName, severity, fromTimestamp, toTimestamp, messageCount); return (LogMessageListResponse) fetchSubResource(volumeName + "/" + RESTConstants.RESOURCE_LOGS, @@ -169,12 +169,12 @@ public class VolumesClient extends AbstractClient { return queryParams; } - private MultivaluedMap prepareGetLogQueryParams(String diskName, String severity, + private MultivaluedMap prepareGetLogQueryParams(String brickName, String severity, Date fromTimestamp, Date toTimestamp, int messageCount) { MultivaluedMap queryParams = new MultivaluedMapImpl(); queryParams.add(RESTConstants.QUERY_PARAM_LINE_COUNT, "" + messageCount); - if (!diskName.equals(CoreConstants.ALL)) { - queryParams.add(RESTConstants.QUERY_PARAM_DISK_NAME, diskName); + if (!brickName.equals(CoreConstants.ALL)) { + queryParams.add(RESTConstants.QUERY_PARAM_BRICK_NAME, brickName); } if (!severity.equals(CoreConstants.ALL)) { -- cgit