From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 15 Mar 2007 15:45:42 +0000 (+0100)
Subject: add rudimentary hang-check based on pcntl_alarm
X-Git-Tag: 1.2.9~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4052b32d16238a2060cec078c0e566c95848c697;p=tt-rss.git

add rudimentary hang-check based on pcntl_alarm
---

diff --git a/update_daemon.php b/update_daemon.php
index f99e4f76..b42d7d21 100644
--- 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.");