apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetUsageRecordsCmd - Removed unnecessary adjust...

Browse Source 
ToDayStart/End because ParamProcessWorker.java is taking care of building proper
date format with day start/end

This closes #185

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Ilia Shakitko 2015-04-23 15:47:40 +02:00 committed by Rohit Yadav
parent fe29998938
commit 5c5873edf1
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/usage/UsageServiceImpl.java
View File

@ -222,11 +222,11 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
throw new InvalidParameterValueException("Incorrect Date Range. Start date: " + startDate + " is after end date:" + endDate);
}
TimeZone usageTZ = getUsageTimezone();
Date adjustedStartDate = computeAdjustedTime(startDate, usageTZ, true);
Date adjustedEndDate = computeAdjustedTime(endDate, usageTZ, false);
Date adjustedStartDate = computeAdjustedTime(startDate, usageTZ);
Date adjustedEndDate = computeAdjustedTime(endDate, usageTZ);
if (s_logger.isDebugEnabled()) {
s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + startDate + " and " + endDate +
s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + adjustedStartDate + " and " + adjustedEndDate +
", using pageSize: " + cmd.getPageSizeVal() + " and startIndex: " + cmd.getStartIndex());
}
@ -408,7 +408,7 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
return true;
}
private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ, boolean adjustToDayStart) {
private Date computeAdjustedTime(Date initialDate, TimeZone targetTZ) {
Calendar cal = Calendar.getInstance();
cal.setTime(initialDate);
TimeZone localTZ = cal.getTimeZone();
@ -428,17 +428,6 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag
}
calTS.add(Calendar.MILLISECOND, -1 * timezoneOffset);
if (adjustToDayStart) {
calTS.set(Calendar.HOUR_OF_DAY, 0);
calTS.set(Calendar.MINUTE, 0);
calTS.set(Calendar.SECOND, 0);
calTS.set(Calendar.MILLISECOND, 0);
} else {
calTS.set(Calendar.HOUR_OF_DAY, 23);
calTS.set(Calendar.MINUTE, 59);
calTS.set(Calendar.SECOND, 59);
calTS.set(Calendar.MILLISECOND, 999);
}
return calTS.getTime();
}