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

address second comment on using str_replace instead of printf for setting filename format expression

Browse Source
This commit is contained in:
Luis Cordova
2013-11-05 13:54:59 -05:00
parent b140ff1bb0
commit fb542f2164
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ class RotatingFileHandler extends StreamHandler
$this->filename = $filename; $this->filename = $filename;
$this->maxFiles = (int) $maxFiles; $this->maxFiles = (int) $maxFiles;
$this->nextRotation = new \DateTime('tomorrow'); $this->nextRotation = new \DateTime('tomorrow');
$this->filenameFormat = '%1$s-%2$s'; $this->filenameFormat = '{filename}-{date}';
$this->dateFormat = 'Y-m-d'; $this->dateFormat = 'Y-m-d';
parent::__construct($this->getTimedFilename(), $level, $bubble); parent::__construct($this->getTimedFilename(), $level, $bubble);
@@ -119,10 +119,10 @@ class RotatingFileHandler extends StreamHandler
protected function getTimedFilename() protected function getTimedFilename()
{ {
$fileInfo = pathinfo($this->filename); $fileInfo = pathinfo($this->filename);
$timedFilename = sprintf( $timedFilename = str_replace(
$fileInfo['dirname'] . '/' . $this->filenameFormat, array('{filename}', '{date}'),
$fileInfo['filename'], array($fileInfo['filename'], date($this->dateFormat)),
date($this->dateFormat) $fileInfo['dirname'] . '/' . $this->filenameFormat
); );
if (!empty($fileInfo['extension'])) { if (!empty($fileInfo['extension'])) {
@@ -135,10 +135,10 @@ class RotatingFileHandler extends StreamHandler
protected function getGlobPattern() protected function getGlobPattern()
{ {
$fileInfo = pathinfo($this->filename); $fileInfo = pathinfo($this->filename);
$glob = sprintf( $glob = str_replace(
$fileInfo['dirname'] . '/' . $this->filenameFormat, array('{filename}', '{date}'),
$fileInfo['filename'], array($fileInfo['filename'], '*'),
'*' $fileInfo['dirname'] . '/' . $this->filenameFormat
); );
if (!empty($fileInfo['extension'])) { if (!empty($fileInfo['extension'])) {
$glob .= '.'.$fileInfo['extension']; $glob .= '.'.$fileInfo['extension'];