=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2013-03-15 16:33:34 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2013-04-03 17:22:34 +0000 @@ -79,7 +79,7 @@ public void update( boolean last3YearsOnly, TaskId taskId ) { - Clock clock = new Clock().startClock().logTime( "Starting update" ); + Clock clock = new Clock().startClock().logTime( "Starting update, no of processes: " + getProcessNo() ); boolean valid = tableManager.validState(); @@ -261,6 +261,8 @@ private int getProcessNo() { - return Math.max( ( SystemUtils.getCpuCores() - 1 ), 1 ); + int cores = SystemUtils.getCpuCores(); + + return cores > 2 ? ( cores - 1 ) : cores; } } === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm 2012-11-30 18:17:32 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm 2013-04-03 17:22:34 +0000 @@ -27,8 +27,8 @@
- | - | ++ |