From: Matteo Nastasi (mop) Date: Wed, 2 Jan 2013 09:44:39 +0000 (+0100) Subject: heartbit graphical feedback added X-Git-Tag: v4.5.0~2 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=68e3f95af106423e5c1e18a723bddd4abdf7e7f7;p=brisk.git heartbit graphical feedback added --- diff --git a/web/briskin5/index.php b/web/briskin5/index.php index 181b9e9..af20289 100644 --- a/web/briskin5/index.php +++ b/web/briskin5/index.php @@ -257,7 +257,7 @@ window.onload = function() { - + diff --git a/web/heartbit.js b/web/heartbit.js index c1d0180..d847356 100644 --- a/web/heartbit.js +++ b/web/heartbit.js @@ -9,13 +9,9 @@ function heartbit_old(symb) } } -function heartbit(s_stat, w_stat) +function heartbit(stat) { - if (w_stat == "r") { - $("stm_stat").src = "img/line-status_cb.png"; - } - else { - $("stm_stat").src = "img/line-status_o"+s_stat+".png"; - } + // console.log("hbit here: "+"img/line-status_"+stat+".png"); + $("stm_stat").src = "img/line-status_"+stat+".png"; } diff --git a/web/index.php b/web/index.php index 5604db1..b0096e0 100644 --- a/web/index.php +++ b/web/index.php @@ -884,7 +884,7 @@ supported by:
%s %s
-'; +'; /* Templates. */ if ($ACTION == 'login') { diff --git a/web/xynt-streaming.js b/web/xynt-streaming.js index 50cea6d..11f4f22 100644 --- a/web/xynt-streaming.js +++ b/web/xynt-streaming.js @@ -198,6 +198,7 @@ transport_htmlfile.prototype = { }, ctx_new_getchar: function(idx) { /* public */ + return (this.ifra.contentWindow.ctx_new.charAt(idx)); }, ctx_old_len_is_set: function () { /* public */ @@ -309,6 +310,7 @@ transport_iframe.prototype = { }, ctx_new_getchar: function(idx) { /* public */ + return (this.ifra.contentWindow.ctx_new.charAt(idx)); }, ctx_old_len_is_set: function () { /* public */ @@ -358,6 +360,12 @@ function xynt_streaming(win, transp_type, console, gst, from, cookiename, sess, this.doc = win.document; this.keepalive_old = -1; this.keepalive_new = -1; + + this.mon_errtime = this.keepalives_eq_max * this.watchdog_checktm * this.watchdog_timeout; + this.mon_wrntime = this.mon_errtime / 2; + + this.mon_update(); + } xynt_streaming.prototype = { @@ -379,7 +387,7 @@ xynt_streaming.prototype = { doc: null, cookiepath: "/brisk/", watchdog_hdl: null, - hbit: null, + hbit: function () {}, keepalive_old: -1, keepalive_new: -1, keepalives_equal: 0, @@ -396,6 +404,43 @@ xynt_streaming.prototype = { stream: "", the_end: false, + mon_time: -1, + mon_wrntime: 0, + mon_errtime: 0, + + mon_stat_old: "", + + mon_update: function() + { + var date = new Date(); + + this.mon_time = date.getTime(); + }, + + /* + ping arrives at least every RD_KEEPALIVE_TOUT secs (currently 4 secs) + + return values: 0 unknown + 1 ok + 2 warning + 3 error + */ + mon_status: function() + { + var delta, date; + + var date = new Date(); + + delta = date.getTime() - this.mon_time; + + if (delta < this.mon_wrntime) + return 1; + else if (delta < this.mon_errtime) + return 2; + else + return 3; + }, + start: function() { /* public */ if (this.the_end) return; @@ -447,6 +492,34 @@ xynt_streaming.prototype = { this.hbit = hbit; }, + + hbit_status: function () { + var ret; + + ret = this.mon_status(); + // console.log("mon_status: "+ret+" 0: "+this.mon_time); + switch (ret) { + case 0: + mon_stat = "b"; + break; + case 1: + mon_stat = "g"; + break; + case 2: + mon_stat = "y"; + break; + case 3: + mon_stat = "r"; + break; + } + + if (this.mon_stat_old != mon_stat) { + this.hbit(mon_stat); + this.mon_stat_old = mon_stat; + } + }, + + watchdog: function () { // alert("watchdog"); var i, again; @@ -503,6 +576,7 @@ xynt_streaming.prototype = { this.log("hs::watchdog: MAX ACHIEVED "+this.keepalives_equal); this.reload(); // alert("watchdog return reload"); + this.hbit_status(); return; } } @@ -537,6 +611,9 @@ xynt_streaming.prototype = { // this.log("ctx_new.char(i) != '_' ["+this.ifra.contentWindow.ctx_new.charAt(i)+"]"); break; } + this.mon_update(); + this.hbit_status(); + // else { // this.log("ctx_new.charAt(i) == '_'"); // } @@ -566,6 +643,8 @@ xynt_streaming.prototype = { comm_len += comm_arr[i].length; } again = 1; + this.mon_update(); + this.hbit_status(); } // this.ifra.contentWindow.ctx_old_len += comm_len; this.transp.ctx_old_len_add(comm_len); @@ -603,6 +682,7 @@ xynt_streaming.prototype = { this.transp.postproc(); } this.watchdog_hdl = setTimeout(function(obj) { /* obj.log("tout2"); */ obj.watchdog(); }, this.watchdog_timeout, this); + this.hbit_status(); } // alert("watchdog return normal");