update.php: add support for output logging

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index f2a962629d7d1b7f92c92bb31ea7183635237421..4b6a43999167a44b04be89aa4f3dd4f23f728938 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -31,6 +31,8 @@
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
+       $master_handlers_installed = false;
+
        $children = array();
        $ctimes = array();
 
@@ -84,26 +86,34 @@
                pcntl_waitpid(-1, $status, WNOHANG);
        }
 
-       function shutdown() {
-               if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock"))
-                       unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+       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"))
+               if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+                       _debug("removing lockfile ($pid)...");
                        unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+               }
        }
 
        function sigint_handler() {
-               shutdown();
-               die("[SIGINT] removing lockfile and exiting.\n");
+               _debug("[MASTER] SIG_INT received.\n");
+               shutdown(posix_getpid());
+               die;
        }
 
        function task_sigint_handler() {
+               _debug("[TASK] SIG_INT received.\n");
                task_shutdown();
-               die("[SIGINT] removing lockfile and exiting.\n");
+               die;
        }
 
        pcntl_signal(SIGCHLD, 'sigchld_handler');
@@ -113,20 +123,13 @@
                        "Maybe another daemon is already running.\n");
        }
 
-       /* if (!pcntl_fork()) {
-               pcntl_signal(SIGINT, 'sigint_handler');
-               register_shutdown_function('shutdown');
-
-               // Try to lock a file in order to avoid concurrent update.
-               $lock_handle = make_lockfile("update_daemon.lock");
-
-               if (!$lock_handle) {
-                       die("error: Can't create lockfile. ".
-                               "Maybe another daemon is already running.\n");
-               }
+       // Try to lock a file in order to avoid concurrent update.
+       $lock_handle = make_lockfile("update_daemon.lock");
 
-               while (true) { sleep(100); }
-       } */
+       if (!$lock_handle) {
+               die("error: Can't create lockfile. ".
+                       "Maybe another daemon is already running.\n");
+       }
 
        // Testing database connection.
        // It is unnecessary to start the fork loop if database is not ok.
@@ -157,6 +160,14 @@
                                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();
@@ -188,7 +199,7 @@
                                        // We disable stamp file, since it is of no use in a multiprocess update.
                                        // not really, tho for the time being -fox
                                        if (!make_stampfile('update_daemon.stamp')) {
-                                               print "warning: unable to create stampfile";
+                                               die("error: unable to create stampfile\n");
                                        }
 
                                        // Call to the feed batch update function