update_daemon2: don't expect client part to be executable

This commit is contained in:
Andrew Dolgov 2008-01-23 15:29:24 +01:00
parent 884c0a367b
commit 73d3b9b1f6
2 changed files with 6 additions and 1 deletions

View File

@ -13,6 +13,7 @@
define('MAX_JOBS', 2); define('MAX_JOBS', 2);
define('CLIENT_PROCESS', './update_daemon2_client.php SRV_RUN_OK'); define('CLIENT_PROCESS', './update_daemon2_client.php SRV_RUN_OK');
define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL);
define('PHP_EXECUTABLE', '/usr/bin/php');
$running_jobs = 0; $running_jobs = 0;
$last_checkpoint = -1; $last_checkpoint = -1;
@ -69,7 +70,7 @@
} else { } else {
pcntl_signal(SIGCHLD, SIG_IGN); pcntl_signal(SIGCHLD, SIG_IGN);
pcntl_signal(SIGINT, SIG_DFL); pcntl_signal(SIGINT, SIG_DFL);
passthru(CLIENT_PROCESS); passthru(PHP_EXECUTABLE . ' ' . CLIENT_PROCESS);
exit(0); exit(0);
} }
} }

View File

@ -3,6 +3,8 @@
// define('DEFAULT_ERROR_LEVEL', E_ALL); // define('DEFAULT_ERROR_LEVEL', E_ALL);
define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE); define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
$start_timestamp = time();
if ($argv[1] != "SRV_RUN_OK") { if ($argv[1] != "SRV_RUN_OK") {
die("This script should be started by update_daemon2.php.\n"); die("This script should be started by update_daemon2.php.\n");
} }
@ -156,5 +158,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";
db_close($link); db_close($link);
?> ?>