mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-05-26 20:42:24 +01:00
parent ba44f35534 5e6b844653
commit 85e43a5e7b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Handler/NewRelicHandler.php
View File

@@ -92,7 +92,7 @@ class NewRelicHandler extends AbstractProcessingHandler
newrelic_notice_error($record['message']); newrelic_notice_error($record['message']);
} }
if (isset($record['formatted']['context'])) { if (isset($record['formatted']['context']) && is_array($record['formatted']['context'])) {
foreach ($record['formatted']['context'] as $key => $parameter) { foreach ($record['formatted']['context'] as $key => $parameter) {
if (is_array($parameter) && $this->explodeArrays) { if (is_array($parameter) && $this->explodeArrays) {
foreach ($parameter as $paramKey => $paramValue) { foreach ($parameter as $paramKey => $paramValue) {
@@ -104,7 +104,7 @@ class NewRelicHandler extends AbstractProcessingHandler
} }
} }
if (isset($record['formatted']['extra'])) { if (isset($record['formatted']['extra']) && is_array($record['formatted']['extra'])) {
foreach ($record['formatted']['extra'] as $key => $parameter) { foreach ($record['formatted']['extra'] as $key => $parameter) {
if (is_array($parameter) && $this->explodeArrays) { if (is_array($parameter) && $this->explodeArrays) {
foreach ($parameter as $paramKey => $paramValue) { foreach ($parameter as $paramKey => $paramValue) {

2
src/Monolog/Handler/StreamHandler.php
View File

@@ -81,7 +81,7 @@ class StreamHandler extends AbstractProcessingHandler
protected function write(array $record) protected function write(array $record)
{ {
if (!is_resource($this->stream)) { if (!is_resource($this->stream)) {
if (!$this->url) { if (null === $this->url || '' === $this->url) {
throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().'); throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().');
} }
$this->createDir(); $this->createDir();