Made graph data service robust to missing endpoint.

kubernetes · May 27, 2015 · 6bd4374 · 6bd4374
1 parent 04aa46d
commit 6bd4374
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/www/master/shared/config/production.json b/www/master/shared/config/production.json
@@ -1,7 +1,7 @@
 {
   "k8sApiServer": "/api/v1beta2",
   "k8sApiv1beta3Server": "/api/v1beta3",
-  "k8sDataServer": "/cluster",
+  "k8sDataServer": "",
   "k8sDataPollMinIntervalSec": 10,
   "k8sDataPollMaxIntervalSec": 120,
   "k8sDataPollErrorThreshold": 5,

diff --git a/www/master/shared/js/modules/services/pollK8sData.js b/www/master/shared/js/modules/services/pollK8sData.js
@@ -12,7 +12,7 @@
     var sampleDataFiles = ["shared/assets/sampleData1.json"];
     this.setSampleDataFiles = function(value) { sampleDataFiles = value; };
 
-    var dataServer = "http://localhost:5555/cluster";
+    var dataServer = "";
     this.setDataServer = function(value) { dataServer = value; };
 
     var pollMinIntervalSec = 10;
@@ -107,24 +107,26 @@
 
       var pollOnce = function(scope, repeat) {
         var dataSource = (k8sdatamodel.useSampleData) ? getSampleDataFile() : dataServer;
-        $.getJSON(dataSource)
-            .done(function(newModel, jqxhr, textStatus) {
-              if (newModel && newModel.success) {
-                delete newModel.success;    // Remove success indicator.
-                delete newModel.timestamp;  // Remove changing timestamp.
-                updateModel(newModel);
-                scope.$apply();
+        if (dataSource) {
+          $.getJSON(dataSource)
+              .done(function(newModel, jqxhr, textStatus) {
+                if (newModel && newModel.success) {
+                  delete newModel.success;    // Remove success indicator.
+                  delete newModel.timestamp;  // Remove changing timestamp.
+                  updateModel(newModel);
+                  scope.$apply();
+                  promise = repeat ? $timeout(function() { pollOnce(scope, true); }, pollInterval * 1000) : undefined;
+                  return;
+                }
+
+                bumpCounters();
                 promise = repeat ? $timeout(function() { pollOnce(scope, true); }, pollInterval * 1000) : undefined;
-                return;
-              }
-
-              bumpCounters();
-              promise = repeat ? $timeout(function() { pollOnce(scope, true); }, pollInterval * 1000) : undefined;
-            })
-            .fail(function(jqxhr, textStatus, error) {
-              bumpCounters();
-              promise = repeat ? $timeout(function() { pollOnce(scope, true); }, pollInterval * 1000) : undefined;
-            });
+              })
+              .fail(function(jqxhr, textStatus, error) {
+                bumpCounters();
+                promise = repeat ? $timeout(function() { pollOnce(scope, true); }, pollInterval * 1000) : undefined;
+              });
+        }
       };
 
       var isPolling = function() { return promise ? true : false; };