move to let/const syntax in custom dojo modules

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index d5b6a45e36b0cf35fa088f875840382077d2544e..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"]);
@@ -203,6 +221,7 @@
                                        if (!$master_handlers_installed) {
                                                _debug("[MASTER] installing shutdown handlers");
                                                pcntl_signal(SIGINT, 'sigint_handler');
+                                               pcntl_signal(SIGTERM, 'sigint_handler');
                                                register_shutdown_function('shutdown', posix_getpid());
                                                $master_handlers_installed = true;
                                        }
@@ -217,10 +236,11 @@
                                        register_shutdown_function('task_shutdown');
 
                                        $quiet = (isset($options["quiet"])) ? "--quiet" : "";
+                                       $log = function_exists("flock") && isset($options['log']) ? '--log '.$options['log'] : '';
 
                                        $my_pid = posix_getpid();
 
-                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet --task $j --pidlock $my_pid");
+                                       passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
                                        sleep(1);