You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by up...@apache.org on 2015/10/05 13:03:14 UTC
svn commit: r1706799 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/webapp/ solr/webapp/web/js/angular/controllers/index.js
Author: upayavira
Date: Mon Oct 5 11:03:14 2015
New Revision: 1706799
URL: http://svn.apache.org/viewvc?rev=1706799&view=rev
Log:
SOLR-7686 Fix dashboard on Windows - don't show load average
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/index.js
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/index.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/index.js?rev=1706799&r1=1706798&r2=1706799&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/index.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/index.js Mon Oct 5 11:03:14 2015
@@ -22,11 +22,13 @@ solrAdminApp.controller('IndexController
$scope.system = data;
// load average
- load_average = ( data.system.uptime || '' ).match( /load averages?: (\d+[.,]\d\d),? (\d+[.,]\d\d),? (\d+[.,]\d\d)/ );
- for (var i=0;i<2;i++) {
- load_average[i]=load_average[i].replace(",","."); // for European users
+ var load_average = ( data.system.uptime || '' ).match( /load averages?: (\d+[.,]\d\d),? (\d+[.,]\d\d),? (\d+[.,]\d\d)/ );
+ if (load_average) {
+ for (var i=0;i<2;i++) {
+ load_average[i]=load_average[i].replace(",","."); // for European users
+ }
+ $scope.load_average = load_average.slice(1);
}
- $scope.load_average = load_average.slice(1);
// physical memory
var memoryMax = parse_memory_value(data.system.totalPhysicalMemorySize);