Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Support for Monolog 2 #51

Open
boboudreau wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for Monolog 2 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a595b3
Update Worker.php - squashed allow-monolog-2 (#2)
boboudreau Sep 10, 2019
56c1219
Update Resque Worker.php; set compatible phpunit version in composer.…
boboudreau Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,8 @@
],
"conflict": {
"chrisboulton/php-resque": "*"
},
"require-dev": {
"phpunit/phpunit": "^5.0"
}
}
12 changes: 6 additions & 6 deletions lib/Resque/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,19 +630,19 @@ public function log($message, $code = self::LOG_TYPE_INFO)
} else {
switch ($code) {
case self::LOG_TYPE_INFO:
$this->logger->addInfo($message, $extra);
$this->logger->info($message, $extra);
break;
case self::LOG_TYPE_WARNING:
$this->logger->addWarning($message, $extra);
$this->logger->warning($message, $extra);
break;
case self::LOG_TYPE_ERROR:
$this->logger->addError($message, $extra);
$this->logger->error($message, $extra);
break;
case self::LOG_TYPE_CRITICAL:
$this->logger->addCritical($message, $extra);
$this->logger->critical($message, $extra);
break;
case self::LOG_TYPE_ALERT:
$this->logger->addAlert($message, $extra);
$this->logger->alert($message, $extra);
}
}

Expand All @@ -652,7 +652,7 @@ public function log($message, $code = self::LOG_TYPE_INFO)
if ($this->logger === null) {
fwrite($this->logOutput, "[" . date('c') . "] " . $message . "\n");
} else {
$this->logger->addDebug($message, $extra);
$this->logger->debug($message, $extra);
}
} else {
return false;
Expand Down