remove errorhandler from CLI scripts for the time being

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 2fbdd8b8cde7db3b68be98c91ce6fe812d967b93..5a033d9bb3fccf20300d55e621cd63b57e2aa307 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -182,6 +182,10 @@
 
        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
@@ -203,8 +207,8 @@
                        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");
+                               echo "Expected schema version: $schema_version, got: $test_schema_version\n";
+                               echo "Schema version changed while we were running, bailing out\n";
                                exit(100);
                        }
 
@@ -284,7 +288,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);