Merge branch 'master' of git.tt-rss.org:fox/tt-rss

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index e5bc55ee089474dd5696119b2f211c55b7275b5f..af29ac18f86e0987f23cc365324cdaadadd63010 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,10 +9,9 @@
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
-       require_once "config.php";
        require_once "autoload.php";
        require_once "functions.php";
-       require_once "rssfuncs.php";
+       require_once "config.php";
 
        // defaults
        define_default('PURGE_INTERVAL', 3600); // seconds
@@ -24,11 +23,20 @@
        require_once "db.php";
        require_once "db-prefs.php";
 
-
        if (!function_exists('pcntl_fork')) {
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
+       $options = getopt("");
+
+       if (!is_array($options)) {
+               die("error: getopt() failed. ".
+                       "Most probably you are using PHP CGI to run this script ".
+                       "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+                       "additional information.\n");
+       }
+
+
        $master_handlers_installed = false;
 
        $children = array();
@@ -36,6 +44,9 @@
 
        $last_checkpoint = -1;
 
+       /**
+        * @SuppressWarnings(unused)
+        */
        function reap_children() {
                global $children;
                global $ctimes;
@@ -76,6 +87,9 @@
                }
        }
 
+       /**
+       * @SuppressWarnings(unused)
+       */
        function sigchld_handler($signal) {
                $running_jobs = reap_children();
 
@@ -152,6 +166,10 @@
                $spawn_interval = SPAWN_INTERVAL;
        }
 
+       // let's enforce a minimum spawn interval as to not forkbomb the host
+       $spawn_interval = max(60, $spawn_interval);
+       _debug("Spawn interval: $spawn_interval sec");
+
        if (isset($options["log"])) {
                _debug("Logging to " . $options["log"]);
                define('LOGFILE', $options["log"]);