X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=51fe8cfec29df8ff63b1448696f61d51cb04492c;hb=f90728cde2d0a7c03f9046cfa94185ed845a03bb;hp=fa64b302d8464aee7836fc0db5112dba24f01a10;hpb=32f3c02ba3afb69cc3b399ac02f4f47a708002e2;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index fa64b302..51fe8cfe 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,23 +9,22 @@
 	define('DISABLE_SESSIONS', true);
 
 	require_once "version.php";
+	require_once "config.php";
+	require_once "autoload.php";
+	require_once "functions.php";
 
-	if (strpos(VERSION, ".99") !== false || getenv('DAEMON_XDEBUG')) {
-		define('DAEMON_EXTENDED_DEBUG', true);
-	}
+	// defaults
+	define_default('PURGE_INTERVAL', 3600); // seconds
+	define_default('MAX_CHILD_RUNTIME', 1800); // seconds
+	define_default('MAX_JOBS', 2);
+	define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
+	define_default('DAEMON_FEED_LIMIT', 250);
 
-	require_once "functions.php";
 	require_once "rssfuncs.php";
 	require_once "sanity_check.php";
-	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
 
-	// defaults
-	define('PURGE_INTERVAL', 3600); // seconds
-	define('MAX_CHILD_RUNTIME', 600); // seconds
-	define('MAX_JOBS', 2);
-	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
 
 	if (!function_exists('pcntl_fork')) {
 		die("error: This script requires PHP compiled with PCNTL module.\n");
@@ -120,7 +119,7 @@
 
 	$longopts = array("log:",
 			"tasks:",
-			"interval",
+			"interval:",
 			"quiet",
 			"help");
 
@@ -142,14 +141,14 @@
 
 	if (isset($options["tasks"])) {
 		_debug("Set to spawn " . $options["tasks"] . " children.");
-		$max_jobs = $option["tasks"];
+		$max_jobs = $options["tasks"];
 	} else {
 		$max_jobs = MAX_JOBS;
 	}
 
 	if (isset($options["interval"])) {
 		_debug("Spawn interval: " . $options["interval"] . " seconds.");
-		$spawn_interval = $option["interval"];
+		$spawn_interval = $options["interval"];
 	} else {
 		$spawn_interval = SPAWN_INTERVAL;
 	}
@@ -172,13 +171,13 @@
 			"Maybe another daemon is already running.\n");
 	}
 
-	// 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);
+	init_plugins();
 
-	if (!init_connection($link)) return;
+	$schema_version = get_schema_version();
 
-	db_close($link);
+	if ($schema_version != SCHEMA_VERSION) {
+		die("Schema version is wrong, please upgrade the database.\n");
+	}
 
 	while (true) {
 
@@ -193,6 +192,16 @@
 
 		if ($last_checkpoint + $spawn_interval < time()) {
 
+			/* Check if schema version changed */
+
+			$test_schema_version = get_schema_version();
+
+			if ($test_schema_version != $schema_version) {
+				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
+				echo "Schema version changed while we were running, bailing out\n";
+				exit(100);
+			}
+
 			check_ctimes();
 			reap_children();
 
@@ -218,68 +227,14 @@
 
 					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();
+					$quiet = (isset($options["quiet"])) ? "--quiet" : "";
 
-					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-					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')) {
-						_debug("warning: unable to create stampfile\n");
-					}
-
-					// Call to the feed batch update function
-					// and maybe regenerate feedbrowser cache
-
-					$nf = 0;
-
-					_debug("Waiting before update [$j]..");
-					sleep($j*5);
-					$nf = update_daemon_common($link);
-
-					if (rand(0,100) > 50) {
-						$count = update_feedbrowser_cache($link);
-						_debug("Feedbrowser updated, $count feeds processed.");
-
-						purge_orphans($link, true);
-
-						$rc = cleanup_tags($link, 14, 50000);
-
-						_debug("Cleaned $rc cached tags.");
-
-						global $pluginhost;
-						$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-					}
-
-					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
-
-					if ($nf > 0) {
-						_debug("Feeds processed: $nf; feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
-					}
+					$my_pid = posix_getpid();
 
-					db_close($link);
+					passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet --task $j --pidlock $my_pid");
 
-					// 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);
 				}