1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-18 21:11:29 +00:00

merge stuff

This commit is contained in:
Andrew Dolgov
2008-01-24 18:37:56 +01:00

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,7 +74,7 @@
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');
@@ -85,11 +85,6 @@
"Maybe another daemon is already running.\n"); "Maybe another daemon is already running.\n");
} }
if (file_is_locked("update_daemon.lock")) {
die("error: Can't create lockfile. ".
"Maybe another daemon is already running.\n");
}
if (!pcntl_fork()) { if (!pcntl_fork()) {
pcntl_signal(SIGINT, 'sigint_handler'); pcntl_signal(SIGINT, 'sigint_handler');