X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=6ccdbcb100e5a7fc2afd614563a1098159b92e76;hb=9b27cec8c01ff231085bc2045d196ace85e299d9;hp=1b4007ac8c15b5b7c2ac150901a93b027c717889;hpb=45004d43408bb006f89dd2c46fb3b934966896b0;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
old mode 100644
new mode 100755
index 1b4007ac..6ccdbcb1
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -3,17 +3,11 @@
 	// This is an experimental multiprocess update daemon.
 	// Some configurable variable may be found below.
 
-	// define('DEFAULT_ERROR_LEVEL', E_ALL);
-	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-
 	declare(ticks = 1);
+	chdir(dirname(__FILE__));
 
-	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')) {
@@ -21,37 +15,45 @@
 	}
 
 	define('PURGE_INTERVAL', 3600); // seconds
+	define('MAX_CHILD_RUNTIME', 600); // seconds
 
 	require_once "sanity_check.php";
 	require_once "config.php";
 
+	define('MAX_JOBS', 2);
 	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
 
-	if (!ENABLE_UPDATE_DAEMON) {
-		die("Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
+	if (!function_exists('pcntl_fork')) {
+		die("error: This script requires PHP compiled with PCNTL module.\n");
 	}
-	
+
 	require_once "db.php";
 	require_once "db-prefs.php";
 	require_once "functions.php";
-	require_once "magpierss/rss_fetch.inc";
-
-	error_reporting(DEFAULT_ERROR_LEVEL);
+	require_once "lib/magpierss/rss_fetch.inc";
 
 	$children = array();
+	$ctimes = array();
 
 	$last_checkpoint = -1;
 
 	function reap_children() {
 		global $children;
+		global $ctimes;
 
 		$tmp = array();
 
 		foreach ($children as $pid) {
 			if (pcntl_waitpid($pid, $status, WNOHANG) != $pid) {
-				array_push($tmp, $pid);
+
+				if (file_is_locked("update_daemon-$pid.lock")) {
+					array_push($tmp, $pid);
+				} else {
+					_debug("[reap_children] child $pid seems active but lockfile is unlocked.");
+				}
 			} else {
-				_debug("[SIGCHLD] child $pid reaped.");
+				_debug("[reap_children] child $pid reaped.");
+				unset($ctimes[$pid]);
 			}
 		}
 
@@ -60,8 +62,17 @@
 		return count($tmp);
 	}
 
-	function sigalrm_handler() {
-		die("[SIGALRM] hang in feed update?\n");
+	function check_ctimes() {
+		global $ctimes;
+
+		foreach (array_keys($ctimes) as $pid) {
+			$started = $ctimes[$pid];
+
+			if (time() - $started > MAX_CHILD_RUNTIME) {
+				_debug("[MASTER] child process $pid seems to be stuck, aborting...");
+				posix_kill($pid, SIGKILL);
+			}
+		}
 	}
 
 	function sigchld_handler($signal) {
@@ -72,12 +83,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")) {
@@ -87,6 +114,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");
@@ -101,19 +129,18 @@
 
 	// 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.		
+		// PG seems to display its own errors just fine by default.
 		return;
 	}
 
 	db_close($link);
 
-
 	while (true) {
 
 		// Since sleep is interupted by SIGCHLD, we need another way to
@@ -127,6 +154,7 @@
 
 		if ($last_checkpoint + SPAWN_INTERVAL < time()) {
 
+			check_ctimes();
 			reap_children();
 
 			for ($j = count($children); $j < MAX_JOBS; $j++) {
@@ -136,63 +164,73 @@
 				} 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.		
+						// PG seems to display its own errors just fine by default.
 						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
 					if (!make_stampfile('update_daemon.stamp')) {
 						print "warning: unable to create stampfile";
-					}	
+					}
 
-					// $last_purge = 0;
+					// Call to the feed batch update function
+					// or regenerate feedbrowser cache
 
-					// if (time() - $last_purge > PURGE_INTERVAL) {
+					if (rand(0,100) > 30) {
+						update_daemon_common($link);
+					} else {
+						$count = update_feedbrowser_cache($link);
+						_debug("Feedbrowser updated, $count feeds processed.");
 
-					// 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);
+						purge_orphans($link, true);
 
-					// 	$last_purge = time();
-					// }
+						$rc = cleanup_tags($link, 14, 50000);
 
-					// Call to the feed batch update function
-					update_daemon_common($link);
+						_debug("Cleaned $rc cached tags.");
+
+					}
 
 					_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);
 				}