X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=05ccb1356977c1b701b0581886aa28580a6d7a4c;hb=7440a7fe3c43644cc3a90fe94e7c23795f04eeba;hp=2fbdd8b8cde7db3b68be98c91ce6fe812d967b93;hpb=e470a273cf09562fb2f9c0c899002303f19c8d16;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 2fbdd8b8..05ccb135 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -14,6 +14,7 @@
 		define('DAEMON_EXTENDED_DEBUG', true);
 	}
 
+	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "rssfuncs.php";
 	require_once "sanity_check.php";
@@ -172,15 +173,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,14 +196,11 @@
 
 			/* 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) {
-				_debug("Expected schema version: $schema_version, got: $test_schema_version");
-				_debug("Schema version changed while we were running, bailing out");
+				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
+				echo "Schema version changed while we were running, bailing out\n";
 				exit(100);
 			}
 
@@ -233,68 +229,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);
-
-					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
+					$quiet = (isset($options["quiet"])) ? "--quiet" : "";
 
-					$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);
 				}