public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 19:55:55 +00:00
Code Issues Releases Wiki Activity

update_daemon2: only set SIGINT handler in lock managing subprocess

Browse Source
This commit is contained in:
Andrew Dolgov
2008-01-24 10:20:00 +01:00
parent c29324c7a4
commit a65a05a72e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
update_daemon2.php
View File

@@ -61,7 +61,7 @@
} }
function sigalrm_handler() { function sigalrm_handler() {
die("received SIGALRM, hang in feed update?\n"); die("[SIGALRM] hang in feed update?\n");
} }
function sigchld_handler($signal) { function sigchld_handler($signal) {
@@ -74,12 +74,11 @@
function sigint_handler() { function sigint_handler() {
unlink(LOCK_DIRECTORY . "/update_daemon.lock"); unlink(LOCK_DIRECTORY . "/update_daemon.lock");
die("Received SIGINT. Exiting.\n"); die("[SIGINT] removing lockfile and exiting.\n");
} }
pcntl_signal(SIGALRM, 'sigalrm_handler'); pcntl_signal(SIGALRM, 'sigalrm_handler');
pcntl_signal(SIGCHLD, 'sigchld_handler'); pcntl_signal(SIGCHLD, 'sigchld_handler');
pcntl_signal(SIGINT, 'sigint_handler');
if (file_is_locked("update_daemon.lock")) { if (file_is_locked("update_daemon.lock")) {
die("error: Can't create lockfile. ". die("error: Can't create lockfile. ".
@@ -92,6 +91,8 @@
} }
if (!pcntl_fork()) { if (!pcntl_fork()) {
pcntl_signal(SIGINT, 'sigint_handler');
$lock_handle = make_lockfile("update_daemon.lock"); $lock_handle = make_lockfile("update_daemon.lock");
if (!$lock_handle) { if (!$lock_handle) {
@@ -282,7 +283,7 @@
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link); if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
print "Elapsed time: " . (time() - $start_timestamp) . " second(s)\n"; _debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");
db_close($link); db_close($link);