add rudimentary hang-check based on pcntl_alarm

diff --git a/update_daemon.php b/update_daemon.php
index f99e4f76379f13ded6169310c5ac414f1ad38fed..b42d7d214ea663879942176043dc95ea46243f36 100644 (file)
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -32,7 +32,12 @@
                die("Received SIGINT. Exiting.\n");
        }
 
+       function sigalrm_handler() {
+               die("received SIGALRM, hang in feed update?\n");
+       }
+
        pcntl_signal(SIGINT, sigint_handler);
+       pcntl_signal(SIGALRM, sigalrm_handler);
 
        $lock_handle = make_lockfile("update_daemon.lock");
 
@@ -146,7 +151,16 @@
 
                                _debug("Updating...");
 
+                               if (defined('MAGPIE_FETCH_TIME_OUT')) {
+                                       pcntl_alarm(MAGPIE_FETCH_TIME_OUT * 2);
+                               } else {
+                                       pcntl_alarm(300);
+                               }
+
                                update_rss_feed($link, $line["feed_url"], $line["id"], true);   
+
+                               pcntl_alarm(0);
+
                                sleep(1); // prevent flood (FIXME make this an option?)
                        } else {
                                _debug("Update not needed.");