From 73d3b9b1f6a4fb509af4085a9944713aff4f7655 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 23 Jan 2008 15:29:24 +0100
Subject: [PATCH] update_daemon2: don't expect client part to be executable

---
 update_daemon2.php        | 3 ++-
 update_daemon2_client.php | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/update_daemon2.php b/update_daemon2.php
index 68989c8e4..d422c5368 100644
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -13,6 +13,7 @@
 	define('MAX_JOBS', 2);
 	define('CLIENT_PROCESS', './update_daemon2_client.php SRV_RUN_OK');
 	define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
+	define('PHP_EXECUTABLE', '/usr/bin/php');
 
 	$running_jobs = 0;
 	$last_checkpoint = -1;
@@ -69,7 +70,7 @@
 				} else {
 					pcntl_signal(SIGCHLD, SIG_IGN);
 					pcntl_signal(SIGINT, SIG_DFL);
-					passthru(CLIENT_PROCESS);
+					passthru(PHP_EXECUTABLE . ' ' . CLIENT_PROCESS);
 					exit(0);
 				}
 			}
diff --git a/update_daemon2_client.php b/update_daemon2_client.php
index ff3ac1d33..8934cbe49 100644
--- a/update_daemon2_client.php
+++ b/update_daemon2_client.php
@@ -3,6 +3,8 @@
 	// define('DEFAULT_ERROR_LEVEL', E_ALL);
 	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
 
+	$start_timestamp = time();
+
 	if ($argv[1] != "SRV_RUN_OK") {
 		die("This script should be started by update_daemon2.php.\n");
 	}
@@ -156,5 +158,7 @@
 
 	if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
 
+	print "Elapsed time: " . (time() - $start_timestamp) . " second(s)\n";
+
 	db_close($link);
 ?>