Skip to content

Commit 5cef885

Browse files
committed
Look for a var in the bin/resque script to allow override
1 parent 726e58a commit 5cef885

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

bin/resque

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ else if(!empty($VVERBOSE)) {
5050
$logLevel = true;
5151
}
5252

53-
$logger = new Resque_Log($logLevel);
54-
5553
$APP_INCLUDE = getenv('APP_INCLUDE');
5654
if($APP_INCLUDE) {
5755
if(!file_exists($APP_INCLUDE)) {
@@ -61,6 +59,12 @@ if($APP_INCLUDE) {
6159
require_once $APP_INCLUDE;
6260
}
6361

62+
// See if the APP_INCLUDE containes a logger object,
63+
// If none exists, fallback to internal logger
64+
if (!isset($logger) && !is_object($logger)) {
65+
$logger = new Resque_Log($logLevel);
66+
}
67+
6468
$BLOCKING = getenv('BLOCKING') !== FALSE;
6569

6670
$interval = 5;
@@ -92,7 +96,7 @@ if($count > 1) {
9296
else if(!$pid) {
9397
$queues = explode(',', $QUEUE);
9498
$worker = new Resque_Worker($queues);
95-
$worker->setLogger(new Resque_Log($logLevel));
99+
$worker->setLogger($logger);
96100
$logger->log(Psr\Log\LogLevel::NOTICE, 'Starting worker {worker}', array('worker' => $worker));
97101
$worker->work($interval, $BLOCKING);
98102
break;
@@ -103,7 +107,7 @@ if($count > 1) {
103107
else {
104108
$queues = explode(',', $QUEUE);
105109
$worker = new Resque_Worker($queues);
106-
$worker->setLogger(new Resque_Log($logLevel));
110+
$worker->setLogger($logger);
107111

108112
$PIDFILE = getenv('PIDFILE');
109113
if ($PIDFILE) {

0 commit comments

Comments
 (0)