Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 05ccb1356977c1b701b0581886aa28580a6d7a4c..5aea5a6eea9c7b31d1a2101f636110ffdd82fc85 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -9,31 +9,26 @@
        define('DISABLE_SESSIONS', true);
 
        require_once "version.php";
-
-       if (strpos(VERSION, ".99") !== false || getenv('DAEMON_XDEBUG')) {
-               define('DAEMON_EXTENDED_DEBUG', true);
-       }
-
+       require_once "config.php";
        require_once "autoload.php";
        require_once "functions.php";
        require_once "rssfuncs.php";
+
+       // defaults
+       define_default('PURGE_INTERVAL', 3600); // seconds
+       define_default('MAX_CHILD_RUNTIME', 1800); // seconds
+       define_default('MAX_JOBS', 2);
+       define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
+
        require_once "sanity_check.php";
-       require_once "config.php";
        require_once "db.php";
        require_once "db-prefs.php";
 
-       // defaults
-       define('PURGE_INTERVAL', 3600); // seconds
-       define('MAX_CHILD_RUNTIME', 600); // seconds
-       define('MAX_JOBS', 2);
-       define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
 
        if (!function_exists('pcntl_fork')) {
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
-       $master_handlers_installed = false;
-
        $children = array();
        $ctimes = array();
 
@@ -87,36 +82,6 @@
                pcntl_waitpid(-1, $status, WNOHANG);
        }
 
-       function shutdown($caller_pid) {
-               if ($caller_pid == posix_getpid()) {
-                       if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
-                               _debug("removing lockfile (master)...");
-                               unlink(LOCK_DIRECTORY . "/update_daemon.lock");
-                       }
-               }
-       }
-
-       function task_shutdown() {
-               $pid = posix_getpid();
-
-               if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
-                       _debug("removing lockfile ($pid)...");
-                       unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
-               }
-       }
-
-       function sigint_handler() {
-               _debug("[MASTER] SIG_INT received.\n");
-               shutdown(posix_getpid());
-               die;
-       }
-
-       function task_sigint_handler() {
-               _debug("[TASK] SIG_INT received.\n");
-               task_shutdown();
-               die;
-       }
-
        pcntl_signal(SIGCHLD, 'sigchld_handler');
 
        $longopts = array("log:",
@@ -173,14 +138,15 @@
                        "Maybe another daemon is already running.\n");
        }
 
-       init_plugins();
-
        $schema_version = get_schema_version();
 
        if ($schema_version != SCHEMA_VERSION) {
                die("Schema version is wrong, please upgrade the database.\n");
        }
 
+       // Protip: children close shared database handle when terminating, it's a bad idea to
+       // do database stuff on main process from now on.
+
        while (true) {
 
                // Since sleep is interupted by SIGCHLD, we need another way to
@@ -193,17 +159,6 @@
                }
 
                if ($last_checkpoint + $spawn_interval < time()) {
-
-                       /* Check if schema version changed */
-
-                       $test_schema_version = get_schema_version();
-
-                       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();
 
@@ -212,22 +167,11 @@
                                if ($pid == -1) {
                                        die("fork failed!\n");
                                } else if ($pid) {
-
-                                       if (!$master_handlers_installed) {
-                                               _debug("[MASTER] installing shutdown handlers");
-                                               pcntl_signal(SIGINT, 'sigint_handler');
-                                               register_shutdown_function('shutdown', posix_getpid());
-                                               $master_handlers_installed = true;
-                                       }
-
                                        _debug("[MASTER] spawned client $j [PID:$pid]...");
                                        array_push($children, $pid);
                                        $ctimes[$pid] = time();
                                } else {
                                        pcntl_signal(SIGCHLD, SIG_IGN);
-                                       pcntl_signal(SIGINT, 'task_sigint_handler');
-
-                                       register_shutdown_function('task_shutdown');
 
                                        $quiet = (isset($options["quiet"])) ? "--quiet" : "";