X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=6d13add0051135c4e65858184ba7ecfc13a11926;hb=aca75cb5cb323535099c7aef46a78ea3cec082f2;hp=2933ccef015e7aa36fdf98aade849d279eb09435;hpb=e81610d9ef6b20400dfc1ab13b1d28cc0de32a84;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 2933ccef..6d13add0 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -14,12 +14,14 @@
 		define('DAEMON_EXTENDED_DEBUG', true);
 	}
 
+	require_once "autoload.php";
 	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";
+	require_once "errorhandler.php";
 
 	// defaults
 	define('PURGE_INTERVAL', 3600); // seconds
@@ -120,7 +122,7 @@
 
 	$longopts = array("log:",
 			"tasks:",
-			"interval",
+			"interval:",
 			"quiet",
 			"help");
 
@@ -142,14 +144,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;
 	}
@@ -176,10 +178,16 @@
 	// It is unnecessary to start the fork loop if database is not ok.
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins($link)) die("Can't initialize db connection.\n");
+
+	$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) {
 
 		// Since sleep is interupted by SIGCHLD, we need another way to
@@ -193,6 +201,19 @@
 
 		if ($last_checkpoint + $spawn_interval < time()) {
 
+			/* Check if schema version changed */
+
+			$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+			if (!init_plugins($link)) die("Can't initialize db connection.\n");
+			$test_schema_version = get_schema_version($link);
+			db_close($link);
+
+			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();
 
@@ -235,7 +256,7 @@
 
 					$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-					if (!init_connection($link)) return;
+					if (!init_plugins($link)) return;
 
 					// We disable stamp file, since it is of no use in a multiprocess update.
 					// not really, tho for the time being -fox
@@ -244,15 +265,15 @@
 					}
 
 					// Call to the feed batch update function
-					// or regenerate feedbrowser cache
+					// and maybe regenerate feedbrowser cache
 
 					$nf = 0;
 
-					if (rand(0,100) > 30) {
-						_debug("Waiting before update..");
-						sleep(rand(5,15));
-						$nf = update_daemon_common($link);
-					} else {
+					_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.");
 
@@ -269,7 +290,11 @@
 					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
 
 					if ($nf > 0) {
-						_debug("Feeds processed: $nf; feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
+						_debug("Feeds processed: $nf");
+
+						if (time() - $start_timestamp > 0) {
+							_debug("Feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
+						}
 					}
 
 					db_close($link);