X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=62bd7591a40a759ee85047809f7c16bdbfda03d3;hb=5893edd57ac8ac18612469eee8ceda1dfe05725e;hp=5ffc4f549934528fcb1c9ae13ddf312325a981a5;hpb=fb0742394a2097a506a777f0bc7c285c07eb6a72;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 5ffc4f54..62bd7591 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,9 +1,13 @@
 #!/usr/bin/php
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR .
+		dirname(__FILE__) . "/include");
+
 	// This is an experimental multiprocess update daemon.
 	// Some configurable variable may be found below.
 
 	declare(ticks = 1);
+	chdir(dirname(__FILE__));
 
 	define('DISABLE_SESSIONS', true);
 
@@ -18,6 +22,11 @@
 
 	require_once "sanity_check.php";
 	require_once "config.php";
+	require_once "db.php";
+	require_once "db-prefs.php";
+	require_once "functions.php";
+	require_once "rssfuncs.php";
+	require_once "lib/magpierss/rss_fetch.inc";
 
 	define('MAX_JOBS', 2);
 	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -26,15 +35,6 @@
 		die("error: This script requires PHP compiled with PCNTL module.\n");
 	}
 
-	if (!ENABLE_UPDATE_DAEMON) {
-		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 "lib/magpierss/rss_fetch.inc";
-
 	$children = array();
 	$ctimes = array();
 
@@ -67,7 +67,7 @@
 
 	function check_ctimes() {
 		global $ctimes;
-		
+
 		foreach (array_keys($ctimes) as $pid) {
 			$started = $ctimes[$pid];
 
@@ -101,12 +101,12 @@
 	function sigint_handler() {
 		shutdown();
 		die("[SIGINT] removing lockfile and exiting.\n");
-	} 
+	}
 
 	function task_sigint_handler() {
 		task_shutdown();
 		die("[SIGINT] removing lockfile and exiting.\n");
-	} 
+	}
 
 	pcntl_signal(SIGCHLD, 'sigchld_handler');
 
@@ -132,15 +132,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);
 
@@ -189,36 +183,38 @@
 
 					$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";
-					}	
+					}
 
-					// Call to the feed batch update function 
+					// Call to the feed batch update function
 					// or regenerate feedbrowser cache
 
 					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.