mirror of
https://github.com/idanoo/php-resque.git
synced 2024-11-22 00:11:53 +00:00
Fixes bin/resque
This commit is contained in:
parent
2794dd54a9
commit
ffff86c40c
@ -59,6 +59,8 @@ if($APP_INCLUDE) {
|
|||||||
require_once $APP_INCLUDE;
|
require_once $APP_INCLUDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$BLOCKING = getenv('BLOCKING') !== FALSE;
|
||||||
|
|
||||||
$interval = 5;
|
$interval = 5;
|
||||||
$INTERVAL = getenv('INTERVAL');
|
$INTERVAL = getenv('INTERVAL');
|
||||||
if(!empty($INTERVAL)) {
|
if(!empty($INTERVAL)) {
|
||||||
@ -89,7 +91,7 @@ if($count > 1) {
|
|||||||
$worker = new Resque_Worker($queues);
|
$worker = new Resque_Worker($queues);
|
||||||
$worker->logLevel = $logLevel;
|
$worker->logLevel = $logLevel;
|
||||||
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
||||||
$worker->work($interval);
|
$worker->work($interval, $BLOCKING);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -107,6 +109,6 @@ else {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
||||||
$worker->work($interval);
|
$worker->work($interval, $BLOCKING);
|
||||||
}
|
}
|
||||||
?>
|
?>
|
105
bin/resque.php
105
bin/resque.php
@ -1,105 +0,0 @@
|
|||||||
<?php
|
|
||||||
// Find and initialize Composer
|
|
||||||
$files = array(
|
|
||||||
__DIR__ . '/../../vendor/autoload.php',
|
|
||||||
__DIR__ . '/../../../autoload.php',
|
|
||||||
__DIR__ . '/../../../../autoload.php',
|
|
||||||
__DIR__ . '/../vendor/autoload.php',
|
|
||||||
);
|
|
||||||
|
|
||||||
$found = false;
|
|
||||||
foreach ($files as $file) {
|
|
||||||
if (file_exists($file)) {
|
|
||||||
require_once $file;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!class_exists('Composer\Autoload\ClassLoader', false)) {
|
|
||||||
die(
|
|
||||||
'You need to set up the project dependencies using the following commands:' . PHP_EOL .
|
|
||||||
'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
|
|
||||||
'php composer.phar install' . PHP_EOL
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$QUEUE = getenv('QUEUE');
|
|
||||||
if(empty($QUEUE)) {
|
|
||||||
die("Set QUEUE env var containing the list of queues to work.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
$REDIS_BACKEND = getenv('REDIS_BACKEND');
|
|
||||||
$REDIS_BACKEND_DB = getenv('REDIS_BACKEND_DB');
|
|
||||||
if(!empty($REDIS_BACKEND)) {
|
|
||||||
if (empty($REDIS_BACKEND_DB))
|
|
||||||
Resque::setBackend($REDIS_BACKEND);
|
|
||||||
else
|
|
||||||
Resque::setBackend($REDIS_BACKEND, $REDIS_BACKEND_DB);
|
|
||||||
}
|
|
||||||
|
|
||||||
$logLevel = 0;
|
|
||||||
$LOGGING = getenv('LOGGING');
|
|
||||||
$VERBOSE = getenv('VERBOSE');
|
|
||||||
$VVERBOSE = getenv('VVERBOSE');
|
|
||||||
if(!empty($LOGGING) || !empty($VERBOSE)) {
|
|
||||||
$logLevel = Resque_Worker::LOG_NORMAL;
|
|
||||||
}
|
|
||||||
else if(!empty($VVERBOSE)) {
|
|
||||||
$logLevel = Resque_Worker::LOG_VERBOSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$BLOCKING = getenv('BLOCKING') !== FALSE;
|
|
||||||
|
|
||||||
$APP_INCLUDE = getenv('APP_INCLUDE');
|
|
||||||
if($APP_INCLUDE) {
|
|
||||||
if(!file_exists($APP_INCLUDE)) {
|
|
||||||
die('APP_INCLUDE ('.$APP_INCLUDE.") does not exist.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once $APP_INCLUDE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$interval = 5;
|
|
||||||
$INTERVAL = getenv('INTERVAL');
|
|
||||||
if(!empty($INTERVAL)) {
|
|
||||||
$interval = $INTERVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
$count = 1;
|
|
||||||
$COUNT = getenv('COUNT');
|
|
||||||
if(!empty($COUNT) && $COUNT > 1) {
|
|
||||||
$count = $COUNT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if($count > 1) {
|
|
||||||
for($i = 0; $i < $count; ++$i) {
|
|
||||||
$pid = Resque::fork();
|
|
||||||
if($pid == -1) {
|
|
||||||
die("Could not fork worker ".$i."\n");
|
|
||||||
}
|
|
||||||
// Child, start the worker
|
|
||||||
else if(!$pid) {
|
|
||||||
$queues = explode(',', $QUEUE);
|
|
||||||
$worker = new Resque_Worker($queues);
|
|
||||||
$worker->logLevel = $logLevel;
|
|
||||||
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
|
||||||
$worker->work($interval, $BLOCKING);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Start a single worker
|
|
||||||
else {
|
|
||||||
$queues = explode(',', $QUEUE);
|
|
||||||
$worker = new Resque_Worker($queues);
|
|
||||||
$worker->logLevel = $logLevel;
|
|
||||||
|
|
||||||
$PIDFILE = getenv('PIDFILE');
|
|
||||||
if ($PIDFILE) {
|
|
||||||
file_put_contents($PIDFILE, getmypid()) or
|
|
||||||
die('Could not write PID information to ' . $PIDFILE);
|
|
||||||
}
|
|
||||||
|
|
||||||
fwrite(STDOUT, '*** Starting worker '.$worker."\n");
|
|
||||||
$worker->work($interval, $BLOCKING);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user