From fb542f21643a04a151c34d322e9d28f7b3764a96 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Tue, 5 Nov 2013 13:54:59 -0500 Subject: [PATCH] address second comment on using str_replace instead of printf for setting filename format expression --- src/Monolog/Handler/RotatingFileHandler.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php index 28a0c816..18a0fcc5 100644 --- a/src/Monolog/Handler/RotatingFileHandler.php +++ b/src/Monolog/Handler/RotatingFileHandler.php @@ -42,7 +42,7 @@ class RotatingFileHandler extends StreamHandler $this->filename = $filename; $this->maxFiles = (int) $maxFiles; $this->nextRotation = new \DateTime('tomorrow'); - $this->filenameFormat = '%1$s-%2$s'; + $this->filenameFormat = '{filename}-{date}'; $this->dateFormat = 'Y-m-d'; parent::__construct($this->getTimedFilename(), $level, $bubble); @@ -119,10 +119,10 @@ class RotatingFileHandler extends StreamHandler protected function getTimedFilename() { $fileInfo = pathinfo($this->filename); - $timedFilename = sprintf( - $fileInfo['dirname'] . '/' . $this->filenameFormat, - $fileInfo['filename'], - date($this->dateFormat) + $timedFilename = str_replace( + array('{filename}', '{date}'), + array($fileInfo['filename'], date($this->dateFormat)), + $fileInfo['dirname'] . '/' . $this->filenameFormat ); if (!empty($fileInfo['extension'])) { @@ -135,10 +135,10 @@ class RotatingFileHandler extends StreamHandler protected function getGlobPattern() { $fileInfo = pathinfo($this->filename); - $glob = sprintf( - $fileInfo['dirname'] . '/' . $this->filenameFormat, - $fileInfo['filename'], - '*' + $glob = str_replace( + array('{filename}', '{date}'), + array($fileInfo['filename'], '*'), + $fileInfo['dirname'] . '/' . $this->filenameFormat ); if (!empty($fileInfo['extension'])) { $glob .= '.'.$fileInfo['extension'];