rebase translations

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 2933ccef015e7aa36fdf98aade849d279eb09435..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);
 
@@ -193,6 +195,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_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();
 
@@ -244,15 +259,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.");