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

increase updstart locking interval to prevent concurrent updates; decrease batch size for the daemon

This commit is contained in:
Andrew Dolgov 2013-04-24 14:15:46 +04:00
parent 6c0d41c644
commit 8cabc200d5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rssfuncs.php
View File

@ -104,9 +104,9 @@
// Test if feed is currently being updated by another process. // Test if feed is currently being updated by another process.
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')"; $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
} else { } else {
$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))"; $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
} }
// Test if there is a limit to number of updated feeds // Test if there is a limit to number of updated feeds

2
update.php
View File

@ -184,7 +184,7 @@
_debug("warning: unable to create stampfile\n"); _debug("warning: unable to create stampfile\n");
} }
update_daemon_common(); update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
$count = update_feedbrowser_cache(); $count = update_feedbrowser_cache();
_debug("Feedbrowser updated, $count feeds processed."); _debug("Feedbrowser updated, $count feeds processed.");

2
update_daemon2.php
View File

@ -12,6 +12,7 @@
require_once "config.php"; require_once "config.php";
require_once "autoload.php"; require_once "autoload.php";
require_once "functions.php"; require_once "functions.php";
require_once "rssfuncs.php";
// defaults // defaults
define_default('PURGE_INTERVAL', 3600); // seconds define_default('PURGE_INTERVAL', 3600); // seconds
@ -19,7 +20,6 @@
define_default('MAX_JOBS', 2); define_default('MAX_JOBS', 2);
define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
require_once "rssfuncs.php";
require_once "sanity_check.php"; require_once "sanity_check.php";
require_once "db.php"; require_once "db.php";
require_once "db-prefs.php"; require_once "db-prefs.php";