X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=a8eb48d4c2bfcf43cef3b120290cba8ed9664dee;hb=36d146f8e234bf0b74f3d937fa4e1b47b9b58935;hp=4d2eed5d99b930258cdb68d98c387ce71cd8fd8b;hpb=0d6a7147e5b82cdf2c973c5efd3e5415fdc0287b;p=tt-rss.git diff --git a/update_daemon2.php b/update_daemon2.php old mode 100644 new mode 100755 index 4d2eed5d..a8eb48d4 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -12,8 +12,6 @@ define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon'); define('DISABLE_SESSIONS', true); - define('MAX_JOBS', 2); - require_once "version.php"; if (strpos(VERSION, ".99") !== false || getenv('DAEMON_XDEBUG')) { @@ -25,6 +23,8 @@ require_once "sanity_check.php"; require_once "config.php"; + define('MAX_JOBS', 2); + define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); if (!ENABLE_UPDATE_DAEMON) { @@ -34,7 +34,7 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; + require_once "lib/magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); @@ -61,7 +61,7 @@ } function sigalrm_handler() { - die("received SIGALRM, hang in feed update?\n"); + die("[SIGALRM] hang in feed update?\n"); } function sigchld_handler($signal) { @@ -74,7 +74,7 @@ function sigint_handler() { unlink(LOCK_DIRECTORY . "/update_daemon.lock"); - die("Received SIGINT. Exiting.\n"); + die("[SIGINT] removing lockfile and exiting.\n"); } pcntl_signal(SIGALRM, 'sigalrm_handler'); @@ -85,14 +85,10 @@ "Maybe another daemon is already running.\n"); } - if (file_is_locked("update_daemon.lock")) { - die("error: Can't create lockfile. ". - "Maybe another daemon is already running.\n"); - } - if (!pcntl_fork()) { pcntl_signal(SIGINT, 'sigint_handler'); + // Try to lock a file in order to avoid concurrent update. $lock_handle = make_lockfile("update_daemon.lock"); if (!$lock_handle) { @@ -117,9 +113,10 @@ db_close($link); - while (true) { + // Since sleep is interupted by SIGCHLD, we need another way to + // respect the SPAWN_INTERVAL $next_spawn = $last_checkpoint + SPAWN_INTERVAL - time(); if ($next_spawn % 10 == 0) { @@ -157,15 +154,7 @@ return; } - if (DB_TYPE == "pgsql") { - pg_query("set client_encoding = 'utf-8'"); - pg_set_client_encoding("UNICODE"); - } else { - if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { - db_query($link, "SET NAMES " . MYSQL_CHARSET); - // db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); - } - } + init_connection($link); // We disable stamp file, since it is of no use in a multiprocess update. // not really, tho for the time being -fox @@ -173,111 +162,23 @@ print "warning: unable to create stampfile"; } - // $last_purge = 0; - - // if (time() - $last_purge > PURGE_INTERVAL) { - // FIXME : $last_purge is of no use in a multiprocess update. // FIXME : We ALWAYS purge old posts. - _debug("Purging old posts (random 30 feeds)..."); - global_purge_old_posts($link, true, 30); - - // $last_purge = time(); - // } - - // Process all other feeds using last_updated and interval parameters - - $random_qpart = sql_random_function(); - - if (DAEMON_UPDATE_LOGIN_LIMIT > 0) { - if (DB_TYPE == "pgsql") { - $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'"; - } else { - $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)"; - } - } else { - $login_thresh_qpart = ""; - } - - //if (DB_TYPE == "pgsql") { - // $update_limit_qpart = "AND ttrss_feeds.last_updated < NOW() - INTERVAL '".(DAEMON_SLEEP_INTERVAL*2)." seconds'"; - //} else { - // $update_limit_qpart = "AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ".(DAEMON_SLEEP_INTERVAL*2)." SECOND)"; - //} - - if (DB_TYPE == "pgsql") { - $update_limit_qpart = "AND ttrss_feeds.last_updated < NOW() - INTERVAL '".(DAEMON_SLEEP_INTERVAL*2)." seconds'"; - $update_limit_qpart = "AND (( - ttrss_feeds.update_interval = 0 - AND ttrss_feeds.last_updated < NOW() - INTERVAL ttrss_user_prefs.value || ' minutes' - ) OR ( - ttrss_feeds.update_interval > 0 - AND ttrss_feeds.last_updated < NOW() - INTERVAL ttrss_feeds.update_interval || ' minutes' - ))"; - } else { - $update_limit_qpart = "AND (( - ttrss_feeds.update_interval = 0 - AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE) - ) OR ( - ttrss_feeds.update_interval > 0 - AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) - ))"; - } + //_debug("Purging old posts (random 30 feeds)..."); + //global_purge_old_posts($link, true, 30); + // Call to the feed batch update function + // or regenerate feedbrowser cache - if (DB_TYPE == "pgsql") { - $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')"; + if (rand(0,100) > 50) { + update_daemon_common($link); } else { - $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))"; - } - - $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid, - SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated, - ttrss_feeds.update_interval - FROM - ttrss_feeds, ttrss_users, ttrss_user_prefs - WHERE - ttrss_feeds.owner_uid = ttrss_users.id - AND ttrss_users.id = ttrss_user_prefs.owner_uid - AND ttrss_user_prefs.pref_name='DEFAULT_UPDATE_INTERVAL' - $login_thresh_qpart $update_limit_qpart - $updstart_thresh_qpart - ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT); - - $user_prefs_cache = array(); - - _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result))); - - // Here is a little cache magic in order to minimize risk of double feed updates. - $feeds_to_update = array(); - while ($line = db_fetch_assoc($result)) { - $feeds_to_update[$line['id']] = $line; - } - - // We update the feed last update started date before anything else. - // There is no lag due to feed contents downloads - // It prevent an other process to update the same feed. - $feed_ids = array_keys($feeds_to_update); - if($feed_ids) { - db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW() - WHERE id IN (%s)", implode(',', $feed_ids))); + $count = update_feedbrowser_cache($link); + _debug("Finished, $count feeds processed."); } - while ($line = array_pop($feeds_to_update)) { - - _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]); - - pcntl_alarm(300); - update_rss_feed($link, $line["feed_url"], $line["id"], true); - pcntl_alarm(0); - - sleep(1); // prevent flood (FIXME make this an option?) - } - - if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link); - _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)"); - + db_close($link); // We are in a fork.