X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=f5e031c9ea977f59db8433663f46ed29a50003ca;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=8e1917b6f6efa91ef9025447342ca5827ee4b019;hpb=4a535e2d31a276b37ba69dfa911d84f7c04ae6c7;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 8e1917b6..f5e031c9 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";
@@ -173,15 +174,15 @@
 			"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();
 
-	db_close($link);
+	if ($schema_version != SCHEMA_VERSION) {
+		die("Schema version is wrong, please upgrade the database.\n");
+	}
 
 	while (true) {
 
@@ -198,10 +199,8 @@
 
 			/* 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);
+			init_plugins();
+			$test_schema_version = get_schema_version();
 
 			if ($test_schema_version != $schema_version) {
 				echo "Expected schema version: $schema_version, got: $test_schema_version\n";
@@ -249,9 +248,7 @@
 
 					$start_timestamp = time();
 
-					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-					if (!init_connection($link)) return;
+					if (!init_plugins()) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox
@@ -266,15 +263,15 @@
 
 					_debug("Waiting before update [$j]..");
 					sleep($j*5);
-					$nf = update_daemon_common($link);
+					$nf = update_daemon_common();
 
 					if (rand(0,100) > 50) {
-						$count = update_feedbrowser_cache($link);
+						$count = update_feedbrowser_cache();
 						_debug("Feedbrowser updated, $count feeds processed.");
 
-						purge_orphans($link, true);
+						purge_orphans( true);
 
-						$rc = cleanup_tags($link, 14, 50000);
+						$rc = cleanup_tags( 14, 50000);
 
 						_debug("Cleaned $rc cached tags.");
 
@@ -292,7 +289,7 @@
 						}
 					}
 
-					db_close($link);
+					db_close();
 
 					// We are in a fork.
 					// We wait a little before exiting to avoid to be faster than our parent process.