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

set smallish timeout on update check, exclude update checking on initial load

This commit is contained in:
Andrew Dolgov 2016-03-30 13:32:49 +03:00
parent e3bc4591af
commit 79c891a8b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/rpc.php
View File

@ -346,7 +346,7 @@ class RPC extends Handler_Protected {
if ($reply['error']['code'] == 0) { if ($reply['error']['code'] == 0) {
$reply['init-params'] = make_init_params(); $reply['init-params'] = make_init_params();
$reply['runtime-info'] = make_runtime_info(); $reply['runtime-info'] = make_runtime_info(true);
} }
print json_encode($reply); print json_encode($reply);

6
include/functions2.php
View File

@ -203,7 +203,7 @@
function check_for_update() { function check_for_update() {
if (defined("GIT_VERSION_TIMESTAMP")) { if (defined("GIT_VERSION_TIMESTAMP")) {
$content = @fetch_file_contents("http://tt-rss.org/version.json"); $content = @fetch_file_contents(array("url" => "http://tt-rss.org/version.json", "timeout" => 5));
if ($content) { if ($content) {
$content = json_decode($content, true); $content = json_decode($content, true);
@ -221,7 +221,7 @@
return ""; return "";
} }
function make_runtime_info() { function make_runtime_info($disable_update_check = false) {
$data = array(); $data = array();
$result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM $result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
@ -240,7 +240,7 @@
$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
if (CHECK_FOR_UPDATES && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { if (CHECK_FOR_UPDATES && !$disable_update_check && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
$update_result = @check_for_update(); $update_result = @check_for_update();
$data["update_result"] = $update_result; $data["update_result"] = $update_result;