valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement sequence numbers for counter rpc requests

This commit is contained in:
Andrew Dolgov 2010-11-11 22:59:01 +03:00
parent 08e49bb91d
commit 6237ea0537
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feedlist.js
View File

@ -607,7 +607,7 @@ function request_counters_real() {
console.log("requesting counters..."); console.log("requesting counters...");
var query = "?op=rpc&subop=getAllCounters"; var query = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
if (tagsAreDisplayed()) { if (tagsAreDisplayed()) {
query = query + "&omode=tl"; query = query + "&omode=tl";

4
modules/backend-rpc.php
View File

@ -2,6 +2,7 @@
function handle_rpc_request($link) { function handle_rpc_request($link) {
$subop = $_REQUEST["subop"]; $subop = $_REQUEST["subop"];
$seq = (int) $_REQUEST["seq"];
if ($subop == "setprofile") { if ($subop == "setprofile") {
$id = db_escape_string($_REQUEST["id"]); $id = db_escape_string($_REQUEST["id"]);
@ -285,6 +286,9 @@
print "<rpc-reply>"; print "<rpc-reply>";
if ($seq)
print "<seq>$seq</seq>";
if ($last_article_id != getLastArticleId($link)) { if ($last_article_id != getLastArticleId($link)) {
print "<counters><![CDATA["; print "<counters><![CDATA[";
$omode = $_REQUEST["omode"]; $omode = $_REQUEST["omode"];

24
tt-rss.js
View File

@ -15,6 +15,17 @@ var feedlist_sortable_enabled = false;
var _force_scheduled_update = false; var _force_scheduled_update = false;
var last_scheduled_update = false; var last_scheduled_update = false;
var _rpc_seq = 0;
function next_seq() {
_rpc_seq += 1;
return _rpc_seq;
}
function get_seq() {
return _rpc_seq;
}
function activeFeedIsCat() { function activeFeedIsCat() {
return _active_feed_is_cat; return _active_feed_is_cat;
} }
@ -167,7 +178,7 @@ function timeout() {
window.clearTimeout(counter_timeout_id); window.clearTimeout(counter_timeout_id);
var query_str = "?op=rpc&subop=getAllCounters"; var query_str = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
var omode; var omode;
@ -1263,6 +1274,17 @@ function handle_rpc_reply(transport, scheduled_call) {
if (!transport_error_check(transport)) return false; if (!transport_error_check(transport)) return false;
var seq = transport.responseXML.getElementsByTagName("seq")[0];
if (seq) {
seq = seq.firstChild.nodeValue;
if (get_seq() != seq) {
//console.log("[handle_rpc_reply] sequence mismatch: " + seq);
return true;
}
}
var message = transport.responseXML.getElementsByTagName("message")[0]; var message = transport.responseXML.getElementsByTagName("message")[0];
if (message) { if (message) {