diff options
-rw-r--r-- | classes/feeditem/atom.php | 6 | ||||
-rw-r--r-- | classes/feeditem/rss.php | 6 | ||||
-rwxr-xr-x | update.php | 2 | ||||
-rwxr-xr-x | update_daemon2.php | 44 |
4 files changed, 12 insertions, 46 deletions
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php index 489c5b148..c9f5b5c62 100644 --- a/classes/feeditem/atom.php +++ b/classes/feeditem/atom.php @@ -16,6 +16,12 @@ class FeedItem_Atom extends FeedItem_Common { if ($updated) { return strtotime($updated->nodeValue); } + + $date = $this->xpath->query("dc:date", $this->elem)->item(0); + + if ($date) { + return strtotime($date->nodeValue); + } } function get_link() { diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php index e09a1fbba..e5960243c 100644 --- a/classes/feeditem/rss.php +++ b/classes/feeditem/rss.php @@ -16,6 +16,12 @@ class FeedItem_RSS extends FeedItem_Common { if ($pubDate) { return strtotime($pubDate->nodeValue); } + + $date = $this->xpath->query("dc:date", $this->elem)->item(0); + + if ($date) { + return strtotime($date->nodeValue); + } } function get_link() { diff --git a/update.php b/update.php index 0141b1a8e..08a872dc0 100755 --- a/update.php +++ b/update.php @@ -350,6 +350,4 @@ fclose($lock_handle); } - if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) - unlink(LOCK_DIRECTORY . "/$lock_filename"); ?> diff --git a/update_daemon2.php b/update_daemon2.php index 9d948a64d..5aea5a6ee 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -29,8 +29,6 @@ die("error: This script requires PHP compiled with PCNTL module.\n"); } - $master_handlers_installed = false; - $children = array(); $ctimes = array(); @@ -84,36 +82,6 @@ pcntl_waitpid(-1, $status, WNOHANG); } - 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")) { - _debug("removing lockfile ($pid)..."); - unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock"); - } - } - - function sigint_handler() { - _debug("[MASTER] SIG_INT received.\n"); - shutdown(posix_getpid()); - die; - } - - function task_sigint_handler() { - _debug("[TASK] SIG_INT received.\n"); - task_shutdown(); - die; - } - pcntl_signal(SIGCHLD, 'sigchld_handler'); $longopts = array("log:", @@ -199,23 +167,11 @@ if ($pid == -1) { die("fork failed!\n"); } else if ($pid) { - - if (!$master_handlers_installed) { - _debug("[MASTER] installing shutdown handlers"); - pcntl_signal(SIGINT, 'sigint_handler'); - pcntl_signal(SIGTERM, '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(); } else { pcntl_signal(SIGCHLD, SIG_IGN); - pcntl_signal(SIGINT, 'task_sigint_handler'); - - register_shutdown_function('task_shutdown'); $quiet = (isset($options["quiet"])) ? "--quiet" : ""; |