Skip to content

Commit 4746684

Browse files
authored
Drop Resque\Logger class (#77)
* Drop Resque\Logger class This removes the internal PSR-3 logger. Now, if no custom logger is set up in the APP_INCLUDE, logging is disabled. * Relax psr/log requirement so projects can use a newer version
1 parent 81deb5b commit 4746684

File tree

5 files changed

+6
-110
lines changed

5 files changed

+6
-110
lines changed

bin/resque

+3-2
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ if($APP_INCLUDE) {
6868
}
6969

7070
// See if the APP_INCLUDE containes a logger object,
71-
// If none exists, fallback to internal logger
71+
// If none exists, use the NullLogger instead, which
72+
// effectively disables logging.
7273
if (!isset($logger) || !is_object($logger)) {
73-
$logger = new \Resque\Logger($logLevel);
74+
$logger = new \Psr\Log\NullLogger();
7475
}
7576

7677
$BLOCKING = getenv('BLOCKING') !== FALSE;

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"require": {
3131
"php": ">=5.6.0",
3232
"colinmollenhour/credis": "~1.7",
33-
"psr/log": "~1.0"
33+
"psr/log": ">=1.1.0"
3434
},
3535
"suggest": {
3636
"ext-pcntl": "REQUIRED for forking processes on platforms that support it (so anything but Windows).",

lib/Logger.php

-69
This file was deleted.

lib/Worker/ResqueWorker.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Resque\Worker;
66

7-
use Resque\Logger;
87
use Resque\Resque;
98
use CredisException;
109
use Psr\Log\LogLevel;
10+
use Psr\Log\NullLogger;
1111
use Resque\Job\PID;
1212
use Resque\Event;
1313
use Resque\Exceptions\DirtyExitException;
@@ -91,7 +91,7 @@ class ResqueWorker
9191
*/
9292
public function __construct($queues)
9393
{
94-
$this->logger = new Logger();
94+
$this->logger = new NullLogger();
9595

9696
if (!is_array($queues)) {
9797
$queues = array($queues);

test/Resque/Tests/LoggerTest.php

-36
This file was deleted.

0 commit comments

Comments
 (0)