Module: nagvis Branch: master Commit: d52342cc2aae5fb8c0b9fb100b7e899c88bda662 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=d52342cc2aae5fb8c0b9fb100b7e899c88bda662
Author: Lars Michelsen <[email protected]> Date: Sun Aug 8 01:51:29 2010 +0200 Reworked error handling on invalid weathermap line percent values --- .../frontend/nagvis-js/js/NagVisStatefulObject.js | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index ee9c437..f97ab2c 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -549,14 +549,18 @@ var NagVisStatefulObject = NagVisObject.extend({ // Get colorFill #1 (in) if(setPerfdata[0][2] !== null && setPerfdata[0][2] == '%' && setPerfdata[0][1] !== null && setPerfdata[0][1] >= 0 && setPerfdata[0][1] <= 100) colorFill = getColorFill(setPerfdata[0][1]); - else + else { + colorFill = '#000000'; this.perfdataError('First', setPerfdata[0][1], this.conf.name, this.conf.service_description); + } // Get colorFill #2 (out) if(setPerfdata[1][2] !== null && setPerfdata[1][2] == '%' && setPerfdata [1][1] !== null && setPerfdata[1][1] >= 0 && setPerfdata[1][1] <= 100) colorFill2 = getColorFill(setPerfdata[1][1]); - else + else { + colorFill = '#000000'; this.perfdataError('Second', setPerfdata[1][1], this.conf.name, this.conf.service_description); + } } } @@ -633,9 +637,7 @@ var NagVisStatefulObject = NagVisObject.extend({ * @author Lars Michelsen <[email protected]> */ perfdataError: function(type, value, name1, name2) { - frontendMessage({'type': 'WARNING', - 'message': type+' set of performance data ('+value+') for '+name1+' ['+name2+'] is not a percentage value', - 'title': 'Data error'}); + this.conf.summary_output += ' (Weathermap Line Error: ' + type+' set of performance data ('+value+') for '+name1+' ['+name2+'] is not a percentage value)'; }, /** ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
