X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=7692eb93030c0ec583cfb229ebdcda8fa35bb71f;hb=654650857ffc3e4914c9655528e1037939f75f54;hp=c6e215a29e20aa7708e6d30e1819f510ac5a8e88;hpb=141bc2420e3794fbc299694a110b237d08cef965;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index c6e215a2..7692eb93 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,23 +9,21 @@
 	define('DISABLE_SESSIONS', true);
 
 	require_once "version.php";
-
-	if (strpos(VERSION, ".99") !== false || getenv('DAEMON_XDEBUG')) {
-		define('DAEMON_EXTENDED_DEBUG', true);
-	}
-
+	require_once "config.php";
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "rssfuncs.php";
+
+	// 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
+
 	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");
@@ -172,15 +170,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)) die("Can't initialize db connection.\n");
+	$schema_version = get_schema_version();
 
-	$schema_version = get_schema_version($link);
-
-	db_close($link);
+	if ($schema_version != SCHEMA_VERSION) {
+		die("Schema version is wrong, please upgrade the database.\n");
+	}
 
 	while (true) {
 
@@ -197,10 +193,7 @@
 
 			/* Check if schema version changed */
 
-			$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-			if (!init_connection($link)) die("Can't initialize db connection.\n");
-			$test_schema_version = get_schema_version($link);
-			db_close($link);
+			$test_schema_version = get_schema_version();
 
 			if ($test_schema_version != $schema_version) {
 				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
@@ -233,72 +226,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();
-
-					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+					$quiet = (isset($options["quiet"])) ? "--quiet" : "";
 
-					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");
-
-						if (time() - $start_timestamp > 0) {
-							_debug("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);
 				}