fix divide by zero in feeds/minute reporting (closes #668)

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index fa64b302d8464aee7836fc0db5112dba24f01a10..c6e215a29e20aa7708e6d30e1819f510ac5a8e88 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -120,7 +120,7 @@
 
        $longopts = array("log:",
                        "tasks:",
-                       "interval",
+                       "interval:",
                        "quiet",
                        "help");
 
@@ -142,14 +142,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,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) {
+                               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();
 
@@ -269,7 +284,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);