X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=18d8936b5ed843f83657cd3d74c5a916d01805e0;hb=9a57512c7099fdc91081f7879b155b3cece2e7c7;hp=431f0b6a11d62dc8a40f89ec42ac142928be060b;hpb=4c93bf06b690dc8a2dd1d8d73b330ee6de7a7043;p=tt-rss.git diff --git a/update_daemon2.php b/update_daemon2.php index 431f0b6a..18d8936b 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -1,12 +1,13 @@ -#!/usr/bin/php +#!/usr/bin/env php MAX_CHILD_RUNTIME) { + _debug("[MASTER] child process $pid seems to be stuck, aborting..."); + posix_kill($pid, SIGKILL); + } + } } function sigchld_handler($signal) { @@ -74,12 +88,28 @@ pcntl_waitpid(-1, $status, WNOHANG); } + function shutdown() { + if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) + unlink(LOCK_DIRECTORY . "/update_daemon.lock"); + } + + function task_shutdown() { + $pid = posix_getpid(); + + if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) + unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock"); + } + function sigint_handler() { - unlink(LOCK_DIRECTORY . "/update_daemon.lock"); + shutdown(); + die("[SIGINT] removing lockfile and exiting.\n"); + } + + function task_sigint_handler() { + task_shutdown(); die("[SIGINT] removing lockfile and exiting.\n"); } - pcntl_signal(SIGALRM, 'sigalrm_handler'); pcntl_signal(SIGCHLD, 'sigchld_handler'); if (file_is_locked("update_daemon.lock")) { @@ -89,6 +119,7 @@ if (!pcntl_fork()) { pcntl_signal(SIGINT, 'sigint_handler'); + register_shutdown_function('shutdown'); // Try to lock a file in order to avoid concurrent update. $lock_handle = make_lockfile("update_daemon.lock"); @@ -103,15 +134,9 @@ // Testing database connection. // It is unnecessary to start the fork loop if database is not ok. - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!$link) { - if (DB_TYPE == "mysql") { - print mysql_error(); - } - // PG seems to display its own errors just fine by default. - return; - } + if (!init_connection($link)) return; db_close($link); @@ -128,6 +153,7 @@ if ($last_checkpoint + SPAWN_INTERVAL < time()) { + check_ctimes(); reap_children(); for ($j = count($children); $j < MAX_JOBS; $j++) { @@ -137,55 +163,68 @@ } else if ($pid) { _debug("[MASTER] spawned client $j [PID:$pid]..."); array_push($children, $pid); + $ctimes[$pid] = time(); } else { pcntl_signal(SIGCHLD, SIG_IGN); - pcntl_signal(SIGINT, SIG_DFL); + pcntl_signal(SIGINT, 'task_sigint_handler'); + + register_shutdown_function('task_shutdown'); + + $my_pid = posix_getpid(); + $lock_filename = "update_daemon-$my_pid.lock"; + + $lock_handle = make_lockfile($lock_filename); + + if (!$lock_handle) { + die("error: Can't create lockfile ($lock_filename). ". + "Maybe another daemon is already running.\n"); + } // ****** Updating RSS code ******* // Only run in fork process. $start_timestamp = time(); - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!$link) { - if (DB_TYPE == "mysql") { - print mysql_error(); - } - // PG seems to display its own errors just fine by default. - return; - } - - init_connection($link); + if (!init_connection($link)) return; // We disable stamp file, since it is of no use in a multiprocess update. // not really, tho for the time being -fox if (!make_stampfile('update_daemon.stamp')) { print "warning: unable to create stampfile"; - } - - // 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); + } - // Call to the feed batch update function + // Call to the feed batch update function // or regenerate feedbrowser cache - if (rand(0,100) > 50) { + if (rand(0,100) > 30) { update_daemon_common($link); } else { $count = update_feedbrowser_cache($link); - _debug("Finished, $count feeds processed."); + _debug("Feedbrowser updated, $count feeds processed."); + + purge_orphans($link, true); + + $rc = cleanup_tags($link, 14, 50000); + + _debug("Cleaned $rc cached tags."); + + _debug("Updating linked feeds..."); + get_linked_feeds($link); + } _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)"); - + db_close($link); // We are in a fork. // We wait a little before exiting to avoid to be faster than our parent process. sleep(1); + + unlink(LOCK_DIRECTORY . "/$lock_filename"); + // We exit in order to avoid fork bombing. exit(0); }