summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2016-05-26 20:42:24 +0100
committerJordi Boggiano <j.boggiano@seld.be>2016-05-26 20:42:24 +0100
commit85e43a5e7b6d229db79e9527865eb6ec57b285be (patch)
treef6dfa729d66f2ce916c4564ebab1be2502116b2f /src
parentba44f355340859eb9987e38e5e80f2d83abb6dc3 (diff)
parent5e6b84465332b9c7596e64b35bf86aff935c2e92 (diff)
downloadmonolog-85e43a5e7b6d229db79e9527865eb6ec57b285be.zip
monolog-85e43a5e7b6d229db79e9527865eb6ec57b285be.tar.gz
monolog-85e43a5e7b6d229db79e9527865eb6ec57b285be.tar.bz2
Merge branch '1.x'
Diffstat (limited to 'src')
-rw-r--r--src/Monolog/Handler/NewRelicHandler.php4
-rw-r--r--src/Monolog/Handler/StreamHandler.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Monolog/Handler/NewRelicHandler.php b/src/Monolog/Handler/NewRelicHandler.php
index 2b27a16..03952e7 100644
--- a/src/Monolog/Handler/NewRelicHandler.php
+++ b/src/Monolog/Handler/NewRelicHandler.php
@@ -92,7 +92,7 @@ class NewRelicHandler extends AbstractProcessingHandler
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) {
if (is_array($parameter) && $this->explodeArrays) {
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) {
if (is_array($parameter) && $this->explodeArrays) {
foreach ($parameter as $paramKey => $paramValue) {
diff --git a/src/Monolog/Handler/StreamHandler.php b/src/Monolog/Handler/StreamHandler.php
index 139356c..ccf4a97 100644
--- a/src/Monolog/Handler/StreamHandler.php
+++ b/src/Monolog/Handler/StreamHandler.php
@@ -81,7 +81,7 @@ class StreamHandler extends AbstractProcessingHandler
protected function write(array $record)
{
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().');
}
$this->createDir();