X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=update_daemon2.php;h=77d05be66159b2556aaebbfed6ec493d044eb3f8;hb=857efe49e653787f5408fc014ae71efec68494d5;hp=7062e8e354cd9bc08a205566a742b18ccf8de72e;hpb=28425ec7028321bef5de72956c82bcd66d2b16ad;p=tt-rss.git

diff --git a/update_daemon2.php b/update_daemon2.php
index 7062e8e3..77d05be6 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -20,6 +20,7 @@
 	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 +121,8 @@
 
 	$longopts = array("log:",
 			"tasks:",
-			"interval",
+			"interval:",
+			"quiet",
 			"help");
 
 	$options = getopt("", $longopts);
@@ -141,14 +143,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;
 	}
@@ -175,23 +177,42 @@
 	// 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_connection($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
 		// respect the spawn interval
 		$next_spawn = $last_checkpoint + $spawn_interval - time();
 
-		if ($next_spawn % 10 == 0) {
+		if ($next_spawn % 60 == 0) {
 			$running_jobs = count($children);
 			_debug("[MASTER] active jobs: $running_jobs, next spawn at $next_spawn sec.");
 		}
 
 		if ($last_checkpoint + $spawn_interval < time()) {
 
+			/* 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);
+
+			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();
 
@@ -239,15 +260,19 @@
 					// 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')) {
-						die("error: unable to create stampfile\n");
+						_debug("warning: unable to create stampfile\n");
 					}
 
 					// Call to the feed batch update function
-					// or regenerate feedbrowser cache
+					// and maybe regenerate feedbrowser cache
 
-					if (rand(0,100) > 30) {
-						update_daemon_common($link);
-					} else {
+					$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.");
 
@@ -263,6 +288,14 @@
 
 					_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)));
+						}
+					}
+
 					db_close($link);
 
 					// We are in a fork.
@@ -274,10 +307,6 @@
 					// We exit in order to avoid fork bombing.
 					exit(0);
 				}
-
-				// We wait a little time before the next fork, in order to let the first fork
-				// mark the feeds it update :
-				sleep(1);
 			}
 			$last_checkpoint = time();
 		}