From 4d8dc016381fa4643561693a6afa0f4e9797c657 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 20 Aug 2012 17:09:59 -0400 Subject: [PATCH] don't crash js if a backend service is not running --- .../public/js/airtime/status/status.js | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/airtime_mvc/public/js/airtime/status/status.js b/airtime_mvc/public/js/airtime/status/status.js index db2b09ad4..5de5c766c 100644 --- a/airtime_mvc/public/js/airtime/status/status.js +++ b/airtime_mvc/public/js/airtime/status/status.js @@ -44,22 +44,24 @@ function generatePartitions(partitions){ function success(data, textStatus, jqXHR){ var services = data.status.services; - for (var key in services){ + for (var key in services) { var s = services[key]; - var children = $("#"+s.name).children(); - $(children[0]).text(s.name); - - var status_class = "not-available-icon"; - if (s.status == 0){ - status_class = "checked-icon"; - } else if (s.status == 1) { - status_class = "warning-icon"; + if (s) { + var children = $("#"+s.name).children(); + $(children[0]).text(s.name); + + var status_class = "not-available-icon"; + if (s.status == 0){ + status_class = "checked-icon"; + } else if (s.status == 1) { + status_class = "warning-icon"; + } + + $($(children[1]).children()[0]).attr("class", status_class); + $(children[2]).text(sprintf('%(days)sd %(hours)sh %(minutes)sm %(seconds)ss', convertSecondsToDaysHoursMinutesSeconds(s.uptime_seconds))); + $(children[3]).text(s.cpu_perc); + $(children[4]).text(sprintf('%01.1fMB (%s)', parseInt(s.memory_kb)/1000, s.memory_perc)); } - - $($(children[1]).children()[0]).attr("class", status_class); - $(children[2]).text(sprintf('%(days)sd %(hours)sh %(minutes)sm %(seconds)ss', convertSecondsToDaysHoursMinutesSeconds(s.uptime_seconds))); - $(children[3]).text(s.cpu_perc); - $(children[4]).text(sprintf('%01.1fMB (%s)', parseInt(s.memory_kb)/1000, s.memory_perc)); } if (data.status.partitions){ generatePartitions(data.status.partitions);