diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-24 14:15:46 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-24 14:23:38 +0400 |
| commit | 8cabc200d5f50327641c6c3ee615095f632afd87 (patch) | |
| tree | fc6a9716e998761fbb085a78bd6ec4f1a52aacb6 | |
| parent | 6c0d41c644a77198d5b1c91dd63cc687779f4cf4 (diff) | |
increase updstart locking interval to prevent concurrent updates; decrease batch size for the daemon
| -rw-r--r-- | include/rssfuncs.php | 4 | ||||
| -rwxr-xr-x | update.php | 2 | ||||
| -rwxr-xr-x | update_daemon2.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index ac00a9408..f4fa18dc9 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -104,9 +104,9 @@ // Test if feed is currently being updated by another process. 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 { - $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 diff --git a/update.php b/update.php index ce354bbae..0853f3dd5 100755 --- a/update.php +++ b/update.php @@ -184,7 +184,7 @@ _debug("warning: unable to create stampfile\n"); } - update_daemon_common(); + update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT); $count = update_feedbrowser_cache(); _debug("Feedbrowser updated, $count feeds processed."); diff --git a/update_daemon2.php b/update_daemon2.php index 30787e6ab..7692eb930 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -12,6 +12,7 @@ require_once "config.php"; require_once "autoload.php"; require_once "functions.php"; + require_once "rssfuncs.php"; // defaults define_default('PURGE_INTERVAL', 3600); // seconds @@ -19,7 +20,6 @@ define_default('MAX_JOBS', 2); define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds - require_once "rssfuncs.php"; require_once "sanity_check.php"; require_once "db.php"; require_once "db-prefs.php"; |