From 0f9067450afce685918ba0edc0cbd621545ee060 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 7 Jun 2013 09:27:52 +0400
Subject: [PATCH] Revert "do not unlink lockfiles (closes #703)"

This reverts commit 9ffe8907dd8be17501601c5af53c73fd0f25ee04.
---
 update.php         |  2 ++
 update_daemon2.php | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/update.php b/update.php
index 08a872dc0..0141b1a8e 100755
--- a/update.php
+++ b/update.php
@@ -350,4 +350,6 @@
 		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 5aea5a6ee..9d948a64d 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -29,6 +29,8 @@
 		die("error: This script requires PHP compiled with PCNTL module.\n");
 	}
 
+	$master_handlers_installed = false;
+
 	$children = array();
 	$ctimes = array();
 
@@ -82,6 +84,36 @@
 		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:",
@@ -167,11 +199,23 @@
 				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" : "";