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

report runtime info in counter callbacks

This commit is contained in:
Andrew Dolgov 2006-05-23 09:59:00 +01:00
parent a756529344
commit f54f515f44
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend-rpc.php
View File

@ -24,22 +24,29 @@
if ($subop == "getLabelCounters") { if ($subop == "getLabelCounters") {
$aid = $_GET["aid"]; $aid = $_GET["aid"];
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getLabelCounters($link); getLabelCounters($link);
if ($aid) { if ($aid) {
getFeedCounter($link, $aid); getFeedCounter($link, $aid);
} }
print "</counters>";
print "</rpc-reply>"; print "</rpc-reply>";
} }
if ($subop == "getFeedCounters") { if ($subop == "getFeedCounters") {
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getFeedCounters($link); getFeedCounters($link);
print "</counters>";
print "</rpc-reply>"; print "</rpc-reply>";
} }
if ($subop == "getAllCounters") { if ($subop == "getAllCounters") {
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getAllCounters($link); getAllCounters($link);
print "</counters>";
print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
} }
@ -71,8 +78,10 @@
update_rss_feed($link, $feed_url, $feed_id); update_rss_feed($link, $feed_url, $feed_id);
} }
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getFeedCounter($link, $feed_id); getFeedCounter($link, $feed_id);
print "</counters>";
print "</rpc-reply>"; print "</rpc-reply>";
return; return;
@ -108,6 +117,8 @@
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
if ($global_unread_caller != $global_unread) { if ($global_unread_caller != $global_unread) {
$omode = $_GET["omode"]; $omode = $_GET["omode"];
@ -126,6 +137,10 @@
getGlobalCounters($link, $global_unread); getGlobalCounters($link, $global_unread);
print "</counters>";
print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
} }
@ -154,7 +169,10 @@
} }
} }
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getAllCounters($link); getAllCounters($link);
print "</counters>";
print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
} }
@ -181,7 +199,10 @@
} }
} }
print "<rpc-reply>"; print "<rpc-reply>";
print "<counters>";
getAllCounters($link); getAllCounters($link);
print "</counters>";
print_runtime_info($link);
print "</rpc-reply>"; print "</rpc-reply>";
} }
@ -190,6 +211,7 @@
if (sanity_check($link)) { if (sanity_check($link)) {
print "<error error-code=\"0\"/>"; print "<error error-code=\"0\"/>";
print_init_params($link); print_init_params($link);
print_runtime_info($link);
} }
print "</rpc-reply>"; print "</rpc-reply>";
} }

9
functions.js
View File

@ -470,6 +470,11 @@ function parse_counters(reply, scheduled_call) {
var f_document = getFeedsContext().document; var f_document = getFeedsContext().document;
var title_obj = getMainContext(); var title_obj = getMainContext();
if (reply.firstChild && reply.firstChild.firstChild) {
debug("<b>wrong element passed to parse_counters, adjusting.</b>");
reply = reply.firstChild;
}
debug("F_DOC: " + f_document + ", T_OBJ: " + title_obj); debug("F_DOC: " + f_document + ", T_OBJ: " + title_obj);
for (var l = 0; l < reply.childNodes.length; l++) { for (var l = 0; l < reply.childNodes.length; l++) {
@ -565,7 +570,9 @@ function all_counters_callback() {
var reply = xmlhttp_rpc.responseXML.firstChild; var reply = xmlhttp_rpc.responseXML.firstChild;
parse_counters(reply); var counters = reply.firstChild;
parse_counters(counters);
} catch (e) { } catch (e) {
exception_error("all_counters_callback", e); exception_error("all_counters_callback", e);

7
functions.php
View File

@ -1718,4 +1718,11 @@
print "</init-params>"; print "</init-params>";
} }
function print_runtime_info($link) {
print "<runtime-info>";
print "<param key=\"daemon_is_running\" value=\"".
sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
print "</runtime-info>";
}
?> ?>

4
tt-rss.js
View File

@ -70,8 +70,10 @@ function refetch_callback() {
if (error_code && error_code != 0) { if (error_code && error_code != 0) {
return fatalError(error_code, reply.getAttribute("error-msg")); return fatalError(error_code, reply.getAttribute("error-msg"));
} }
var counters = reply.firstChild;
parse_counters(reply, true); parse_counters(counters, true);
debug("refetch_callback: done"); debug("refetch_callback: done");