projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keepalives_eq_max management fixed to have a correct count of seconds
[brisk.git]
/
web
/
xynt-streaming.js
diff --git
a/web/xynt-streaming.js
b/web/xynt-streaming.js
index
117c9f7
..
47ca442
100644
(file)
--- a/
web/xynt-streaming.js
+++ b/
web/xynt-streaming.js
@@
-244,10
+244,16
@@
transport_iframe.prototype = {
ifra: null,
destroy: function () { /* public */
ifra: null,
destroy: function () { /* public */
- if (this.ifra != null) {
- this.doc.body.removeChild(this.ifra);
- delete this.ifra;
- this.ifra = null;
+ try {
+ if (this.ifra != null) {
+ // FIXME: with opera on win this remove child crash js so is
+ // commented
+ // this.doc.body.removeChild(this.ifra);
+ delete this.ifra;
+ this.ifra = null;
+ }
+ } catch (b) {
+ alert("catched");
}
},
}
},
@@
-359,8
+365,8
@@
xynt_streaming.prototype = {
keepalive_new: -1,
keepalives_equal: 0,
/* NOTE: right watch_timeout value to 100, for devel reasons use 1000 or more */
keepalive_new: -1,
keepalives_equal: 0,
/* NOTE: right watch_timeout value to 100, for devel reasons use 1000 or more */
- /* restart after
3 * 40 * 100 millisec if server ping is missing => 12
secs */
- keepalives_eq_max:
3
,
+ /* restart after
4 * 40 * 100 millisec if server ping is missing => 16
secs */
+ keepalives_eq_max:
4
,
watchdog_checktm: 40,
// FIXME watchdog_timeout: 100,
watchdog_timeout: 100,
watchdog_checktm: 40,
// FIXME watchdog_timeout: 100,
watchdog_timeout: 100,
@@
-390,12
+396,15
@@
xynt_streaming.prototype = {
// transport instantiation
if (this.transp_type == "xhr") {
// transport instantiation
if (this.transp_type == "xhr") {
+ this.page = url_append_args(this.page, "transp", "xhr");
this.transp = new transport_xhr(this.doc, this, this.page);
}
else if (this.transp_type == "iframe") {
this.transp = new transport_xhr(this.doc, this, this.page);
}
else if (this.transp_type == "iframe") {
+ this.page = url_append_args(this.page, "transp", "iframe");
this.transp = new transport_iframe(this.doc, this, this.page);
}
else if (this.transp_type == "htmlfile") {
this.transp = new transport_iframe(this.doc, this, this.page);
}
else if (this.transp_type == "htmlfile") {
+ this.page = url_append_args(this.page, "transp", "htmlfile");
this.transp = new transport_htmlfile(this.doc, this, this.page);
}
else
this.transp = new transport_htmlfile(this.doc, this, this.page);
}
else
@@
-469,7
+478,7
@@
xynt_streaming.prototype = {
this.keepalives_equal = 0;
}
this.keepalives_equal = 0;
}
- if (this.keepalives_equal > this.keepalives_eq_max) {
+ if (this.keepalives_equal >
=
this.keepalives_eq_max) {
this.log("hs::watchdog: MAX ACHIEVED "+this.keepalives_equal);
this.reload();
// alert("watchdog return reload");
this.log("hs::watchdog: MAX ACHIEVED "+this.keepalives_equal);
this.reload();
// alert("watchdog return reload");