mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 17:46:09 +02:00
Code Issues Releases Wiki Activity

Add Logger::close and clarify what close and reset do plus

Browse Source
This commit is contained in:
Jordi Boggiano
2018-11-04 22:15:25 +01:00
parent 712c5dacf6
commit b80352368c
8 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,8 +177,6 @@ abstract class AbstractHandler implements HandlerInterface, ResettableInterface
public function reset()
{
$this->close();
foreach ($this->processors as $processor) {
if ($processor instanceof ResettableInterface) {
$processor->reset();

5
src/Monolog/Handler/BrowserConsoleHandler.php
View File

@@ -73,6 +73,11 @@ class BrowserConsoleHandler extends AbstractProcessingHandler
}
}
public function close()
{
self::resetStatic();
}
public function reset()
{
self::resetStatic();

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

@@ -118,6 +118,8 @@ class BufferHandler extends AbstractHandler
public function reset()
{
$this->flush();
parent::reset();
if ($this->handler instanceof ResettableInterface) {

38
src/Monolog/Handler/FingersCrossedHandler.php
View File

@@ -131,27 +131,14 @@ class FingersCrossedHandler extends AbstractHandler
*/
public function close()
{
if (null !== $this->passthruLevel) {
$level = $this->passthruLevel;
$this->buffer = array_filter($this->buffer, function ($record) use ($level) {
return $record['level'] >= $level;
});
if (count($this->buffer) > 0) {
$this->handler->handleBatch($this->buffer);
$this->buffer = array();
}
}
$this->flushBuffer();
}
/**
* Resets the state of the handler. Stops forwarding records to the wrapped handler.
*/
public function reset()
{
parent::reset();
$this->flushBuffer();
$this->buffer = array();
$this->buffering = true;
parent::reset();
if ($this->handler instanceof ResettableInterface) {
$this->handler->reset();
@@ -168,4 +155,23 @@ class FingersCrossedHandler extends AbstractHandler
$this->buffer = array();
$this->reset();
}
/**
* Resets the state of the handler. Stops forwarding records to the wrapped handler.
*/
private function flushBuffer()
{
if (null !== $this->passthruLevel) {
$level = $this->passthruLevel;
$this->buffer = array_filter($this->buffer, function ($record) use ($level) {
return $record['level'] >= $level;
});
if (count($this->buffer) > 0) {
$this->handler->handleBatch($this->buffer);
}
}
$this->buffer = array();
$this->buffering = true;
}
}

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

@@ -129,4 +129,16 @@ class RollbarHandler extends AbstractProcessingHandler
{
$this->flush();
}
/**
* {@inheritdoc}
*/
public function reset()
{
$this->flush();
parent::reset();
}
}

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

@@ -66,6 +66,18 @@ class RotatingFileHandler extends StreamHandler
}
}
/**
* {@inheritdoc}
*/
public function reset()
{
parent::reset();
if (true === $this->mustRotate) {
$this->rotate();
}
}
public function setFilenameFormat($filenameFormat, $dateFormat)
{
if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {