mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-07 05:36:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-11-15 13:16:37 +01:00
parent 4a43d9b17c f1d2b090d5
commit 9cabe2961a
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.mdown
View File

@@ -1,3 +1,13 @@
### 1.22.0 (2016-11-XX)
* Added MercurialProcessor to add mercurial revision and branch names to log records
* Added support for AWS SDK v3 in DynamoDbHandler
* Fixed fatal errors occuring when normalizing generators that have been fully consumed
* Fixed RollbarHandler to include a level (rollbar level), monolog_level (original name), channel and datetime (unix)
* Fixed RollbarHandler not flushing records automatically, calling close() explicitly is not necessary anymore
* Fixed SyslogUdpHandler to avoid sending empty frames
* Fixed a few PHP7 compatibility issues
### 1.21.0 (2016-07-29) ### 1.21.0 (2016-07-29)
* Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues * Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues

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

@@ -115,13 +115,23 @@ class StreamHandler extends AbstractProcessingHandler
flock($this->stream, LOCK_EX); flock($this->stream, LOCK_EX);
} }
fwrite($this->stream, (string) $record['formatted']); $this->streamWrite($this->stream, $record);
if ($this->useLocking) { if ($this->useLocking) {
flock($this->stream, LOCK_UN); flock($this->stream, LOCK_UN);
} }
} }
/**
* Write to stream
* @param resource $stream
* @param array $record
*/
protected function streamWrite($stream, array $record)
{
fwrite($stream, (string) $record['formatted']);
}
private function customErrorHandler($code, $msg) private function customErrorHandler($code, $msg)
{ {
$this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg); $this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);