update.php: fix help text

[tt-rss.git] / update_daemon2.php

diff --git a/update_daemon2.php b/update_daemon2.php
index d7141c87815a0d8a784b0e099502363dbb7fcdcd..18d8936b5ed843f83657cd3d74c5a916d01805e0 100755 (executable)
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,12 +1,13 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
+       set_include_path(get_include_path() . PATH_SEPARATOR .
+               dirname(__FILE__) . "/include");
+
        // This is an experimental multiprocess update daemon.
        // Some configurable variable may be found below.
 
-       // define('DEFAULT_ERROR_LEVEL', E_ALL);
-       define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-
        declare(ticks = 1);
+       chdir(dirname(__FILE__));
 
        define('DISABLE_SESSIONS', true);
 
@@ -21,6 +22,11 @@
 
        require_once "sanity_check.php";
        require_once "config.php";
+       require_once "db.php";
+       require_once "db-prefs.php";
+       require_once "functions.php";
+       require_once "rssfuncs.php";
+       require_once "lib/magpierss/rss_fetch.inc";
 
        define('MAX_JOBS', 2);
        define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
@@ -29,17 +35,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";
-
-       error_reporting(DEFAULT_ERROR_LEVEL);
-
        $children = array();
        $ctimes = array();
 
@@ -58,6 +53,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.");
@@ -72,7 +69,7 @@
 
        function check_ctimes() {
                global $ctimes;
-               
+
                foreach (array_keys($ctimes) as $pid) {
                        $started = $ctimes[$pid];
 
@@ -106,12 +103,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');
 
@@ -137,15 +134,9 @@
 
        // 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);
 
@@ -194,36 +185,38 @@
 
                                        $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) {
                                                update_daemon_common($link);
                                        } else {
                                                $count = update_feedbrowser_cache($link);
-                                               _debug("Finished, $count feeds processed.");
+                                               _debug("Feedbrowser updated, $count feeds processed.");
+
+                                               purge_orphans($link, true);
+
+                                               $rc = cleanup_tags($link, 14, 50000);
+
+                                               _debug("Cleaned $rc cached tags.");
+
+                                               _debug("Updating linked feeds...");
+                                               get_linked_feeds($link);
+
                                        }
 
                                        _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
- 
+
                                        db_close($link);
 
                                        // We are in a fork.