X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=431f0b6a11d62dc8a40f89ec42ac142928be060b;hb=1d064e0da50c53708a593e50932fe35eddc55278;hp=e7b5aeb202d948fff592b882aee7caa75ad52431;hpb=a65a05a72e5f736cd81791fc18181a9c43f7a496;p=tt-rss.git diff --git a/update_daemon2.php b/update_daemon2.php old mode 100644 new mode 100755 index e7b5aeb2..431f0b6a --- a/update_daemon2.php +++ b/update_daemon2.php @@ -8,12 +8,8 @@ declare(ticks = 1); - define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon'); - 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,16 +21,22 @@ require_once "sanity_check.php"; require_once "config.php"; + define('MAX_JOBS', 2); + define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); + if (!function_exists('pcntl_fork')) { + die("error: This script requires PHP compiled with PCNTL module.\n"); + } + if (!ENABLE_UPDATE_DAEMON) { - die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n"); + die("error: Please enable option ENABLE_UPDATE_DAEMON in config.php\n"); } 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); @@ -85,14 +87,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 +115,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 +156,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,118 +164,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 = ""; - } + //_debug("Purging old posts (random 30 feeds)..."); + //global_purge_old_posts($link, true, 30); - 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)"; - } + // 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')"; - } 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 feed_url,ttrss_feeds.id,owner_uid, - SUBSTRING(last_updated,1,19) AS last_updated, - update_interval - FROM - ttrss_feeds,ttrss_users - WHERE - ttrss_users.id = owner_uid $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))); - } - - while ($line = array_pop($feeds_to_update)) { - - $upd_intl = $line["update_interval"]; - $user_id = $line["owner_uid"]; - - if (!$upd_intl || $upd_intl == 0) { - if (!$user_prefs_cache[$user_id]['DEFAULT_UPDATE_INTERVAL']) { - $upd_intl = get_pref($link, 'DEFAULT_UPDATE_INTERVAL', $user_id); - $user_prefs_cache[$user_id]['DEFAULT_UPDATE_INTERVAL'] = $upd_intl; - } else { - $upd_intl = $user_prefs_cache[$user_id]['DEFAULT_UPDATE_INTERVAL']; - } - } - - if ($upd_intl < 0) { - # print "Updates disabled.\n"; - continue; - } - - _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]); - - // _debug(sprintf("\tLU: %d, INTL: %d, UID: %d) ", - // time() - strtotime($line["last_updated"]), $upd_intl*60, $user_id)); - - if (!$line["last_updated"] || - time() - strtotime($line["last_updated"]) > ($upd_intl * 60)) { - - _debug("Updating..."); - - 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?) - } else { - _debug("Update not needed."); - } + if (rand(0,100) > 50) { + update_daemon_common($link); + } else { + $count = update_feedbrowser_cache($link); + _debug("Finished, $count feeds processed."); } - if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link); - _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)"); - + db_close($link); // We are in a fork. @@ -293,6 +189,10 @@ // We exit in order to avoid fork bombing. exit(0); } + + // We wait a little time before the next fork, in order to let the first fork + // mark the feeds it update : + sleep(1); } $last_checkpoint = time(); }