daemon: enable master lockfile

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index 63f218cc4961692765ea068c209a6ecb395650db..cee61bb6e69ad52e3a5c6d93db0d025b2d5d2a34 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,9 +1,10 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
-       // This is an experimental multiprocess update daemon.
-       // Some configurable variable may be found below.
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
        declare(ticks = 1);
+       chdir(dirname(__FILE__));
 
        define('DISABLE_SESSIONS', true);
 
@@ -16,8 +17,12 @@
        define('PURGE_INTERVAL', 3600); // seconds
        define('MAX_CHILD_RUNTIME', 600); // seconds
 
+       require_once "functions.php";
+       require_once "rssfuncs.php";
        require_once "sanity_check.php";
        require_once "config.php";
+       require_once "db.php";
+       require_once "db-prefs.php";
 
        define('MAX_JOBS', 2);
        define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -26,15 +31,6 @@
                die("error: This script requires PHP compiled with PCNTL module.\n");
        }
 
-       if (!ENABLE_UPDATE_DAEMON) {
-               die("error: Please enable option ENABLE_UPDATE_DAEMON in config.php\n");
-       }
-       
-       require_once "db.php";
-       require_once "db-prefs.php";
-       require_once "functions.php";
-       require_once "lib/magpierss/rss_fetch.inc";
-
        $children = array();
        $ctimes = array();
 
@@ -53,6 +49,8 @@
                                        array_push($tmp, $pid);
                                } else {
                                        _debug("[reap_children] child $pid seems active but lockfile is unlocked.");
+                                       unset($ctimes[$pid]);
+
                                }
                        } else {
                                _debug("[reap_children] child $pid reaped.");
@@ -67,7 +65,7 @@
 
        function check_ctimes() {
                global $ctimes;
-               
+
                foreach (array_keys($ctimes) as $pid) {
                        $started = $ctimes[$pid];
 
@@ -101,12 +99,12 @@
        function sigint_handler() {
                shutdown();
                die("[SIGINT] removing lockfile and exiting.\n");
-       } 
+       }
 
        function task_sigint_handler() {
                task_shutdown();
                die("[SIGINT] removing lockfile and exiting.\n");
-       } 
+       }
 
        pcntl_signal(SIGCHLD, 'sigchld_handler');
 
@@ -115,7 +113,15 @@
                        "Maybe another daemon is already running.\n");
        }
 
-       if (!pcntl_fork()) {
+       // 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");
+       }
+
+       /* if (!pcntl_fork()) {
                pcntl_signal(SIGINT, 'sigint_handler');
                register_shutdown_function('shutdown');
 
@@ -128,19 +134,13 @@
                }
 
                while (true) { sleep(100); }
-       }
+       } */
 
        // Testing database connection.
        // It is unnecessary to start the fork loop if database is not ok.
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
+       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       if (!$link) {
-               if (DB_TYPE == "mysql") {
-                       print mysql_error();
-               }
-               // PG seems to display its own errors just fine by default.             
-               return;
-       }
+       if (!init_connection($link)) return;
 
        db_close($link);
 
@@ -189,25 +189,17 @@
 
                                        $start_timestamp = time();
 
-                                       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); 
-
-                                       if (!$link) {
-                                               if (DB_TYPE == "mysql") {
-                                                       print mysql_error();
-                                               }
-                                               // PG seems to display its own errors just fine by default.             
-                                               return;
-                                       }
+                                       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-                                       init_connection($link);
+                                       if (!init_connection($link)) return;
 
                                        // 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";
-                                       }       
+                                       }
 
-                                       // Call to the feed batch update function 
+                                       // Call to the feed batch update function
                                        // or regenerate feedbrowser cache
 
                                        if (rand(0,100) > 30) {
@@ -222,10 +214,12 @@
 
                                                _debug("Cleaned $rc cached tags.");
 
+                                               global $pluginhost;
+                                               $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
                                        }
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
- 
+
                                        db_close($link);
 
                                        // We are in a fork.