daemon2: check if schema version changed

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 4d226ef739ec570d41c1bb88f7cba36fbb2afdc3..c87f0c10a60adcf7a69df11dd24ddb09756a4616 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -176,7 +176,9 @@
        // 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);
 
@@ -186,13 +188,26 @@
                // 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) {
+                               _debug("Expected schema version: $schema_version, got: $test_schema_version");
+                               _debug("Schema version changed while we were running, bailing out");
+                               exit(100);
+                       }
+
                        check_ctimes();
                        reap_children();
 
@@ -240,15 +255,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.");
 
@@ -264,6 +283,10 @@
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
 
+                                       if ($nf > 0) {
+                                               _debug("Feeds processed: $nf; feeds/minute: " . sprintf("%.2d", $nf/((time()-$start_timestamp)/60)));
+                                       }
+
                                        db_close($link);
 
                                        // We are in a fork.
@@ -275,10 +298,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();
                }