valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "do not unlink lockfiles (closes #703)" 

This reverts commit 9ffe8907dd.
This commit is contained in:
Andrew Dolgov 2013-06-07 09:27:52 +04:00
parent 5a8d8a87e5
commit 0f9067450a
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
update.php
View File

@ -350,4 +350,6 @@
fclose($lock_handle); fclose($lock_handle);
} }
if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
unlink(LOCK_DIRECTORY . "/$lock_filename");
?> ?>

44
update_daemon2.php
View File

@ -29,6 +29,8 @@
die("error: This script requires PHP compiled with PCNTL module.\n"); die("error: This script requires PHP compiled with PCNTL module.\n");
} }
$master_handlers_installed = false;
$children = array(); $children = array();
$ctimes = array(); $ctimes = array();
@ -82,6 +84,36 @@
pcntl_waitpid(-1, $status, WNOHANG); 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'); pcntl_signal(SIGCHLD, 'sigchld_handler');
$longopts = array("log:", $longopts = array("log:",
@ -167,11 +199,23 @@
if ($pid == -1) { if ($pid == -1) {
die("fork failed!\n"); die("fork failed!\n");
} else if ($pid) { } 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]..."); _debug("[MASTER] spawned client $j [PID:$pid]...");
array_push($children, $pid); array_push($children, $pid);
$ctimes[$pid] = time(); $ctimes[$pid] = time();
} else { } else {
pcntl_signal(SIGCHLD, SIG_IGN); pcntl_signal(SIGCHLD, SIG_IGN);
pcntl_signal(SIGINT, 'task_sigint_handler');
register_shutdown_function('task_shutdown');
$quiet = (isset($options["quiet"])) ? "--quiet" : ""; $quiet = (isset($options["quiet"])) ? "--quiet" : "";