[lucene-solr] branch master updated: SOLR-14112: do not display load average of -1.00 on windows in admin UI

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmuir pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new b7b6b0f  SOLR-14112: do not display load average of -1.00 on windows in admin UI
b7b6b0f is described below

commit b7b6b0f3bfe4cf27c73ec6f4da0e25a95f70a954
Author: Robert Muir <rm...@apache.org>
AuthorDate: Fri Dec 20 05:42:00 2019 -0500

    SOLR-14112: do not display load average of -1.00 on windows in admin UI
---
 solr/webapp/web/js/angular/controllers/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/webapp/web/js/angular/controllers/index.js b/solr/webapp/web/js/angular/controllers/index.js
index 34299a7..d8052d4 100644
--- a/solr/webapp/web/js/angular/controllers/index.js
+++ b/solr/webapp/web/js/angular/controllers/index.js
@@ -21,8 +21,10 @@ solrAdminApp.controller('IndexController', function($scope, System, Cores, Const
     System.get(function(data) {
       $scope.system = data;
 
-      // load average
-      $scope.load_average = data.system.systemLoadAverage.toFixed(2);
+      // load average, unless its negative (means n/a on windows, etc)
+      if (data.system.systemLoadAverage >= 0) {
+        $scope.load_average = data.system.systemLoadAverage.toFixed(2);
+      }
 
       // physical memory
       var memoryMax = parse_memory_value(data.system.totalPhysicalMemorySize);