diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php index 22a3841a..4168c32f 100644 --- a/src/Monolog/Handler/RotatingFileHandler.php +++ b/src/Monolog/Handler/RotatingFileHandler.php @@ -37,9 +37,9 @@ class RotatingFileHandler extends StreamHandler * @param integer $level The minimum logging level at which this handler will be triggered * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not * @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write) - * @param Boolean $preferLocking Try to lock log file before doing any writes + * @param Boolean $useLocking Try to lock log file before doing any writes */ - public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $preferLocking = false) + public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $useLocking = false) { $this->filename = $filename; $this->maxFiles = (int) $maxFiles; @@ -47,7 +47,7 @@ class RotatingFileHandler extends StreamHandler $this->filenameFormat = '{filename}-{date}'; $this->dateFormat = 'Y-m-d'; - parent::__construct($this->getTimedFilename(), $level, $bubble, $filePermission, $preferLocking); + parent::__construct($this->getTimedFilename(), $level, $bubble, $filePermission, $useLocking); } /** diff --git a/src/Monolog/Handler/StreamHandler.php b/src/Monolog/Handler/StreamHandler.php index 81ecfac0..c67649b3 100644 --- a/src/Monolog/Handler/StreamHandler.php +++ b/src/Monolog/Handler/StreamHandler.php @@ -26,16 +26,16 @@ class StreamHandler extends AbstractProcessingHandler protected $url; private $errorMessage; protected $filePermission; - protected $preferLocking; + protected $useLocking; /** * @param string $stream * @param integer $level The minimum logging level at which this handler will be triggered * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not * @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write) - * @param Boolean $preferLocking Try to lock log file before doing any writes + * @param Boolean $useLocking Try to lock log file before doing any writes */ - public function __construct($stream, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $preferLocking = false) + public function __construct($stream, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $useLocking = false) { parent::__construct($level, $bubble); if (is_resource($stream)) { @@ -45,7 +45,7 @@ class StreamHandler extends AbstractProcessingHandler } $this->filePermission = $filePermission; - $this->preferLocking = $preferLocking; + $this->useLocking = $useLocking; } /** @@ -81,14 +81,14 @@ class StreamHandler extends AbstractProcessingHandler } } - if ($this->preferLocking) { + if ($this->useLocking) { // ignoring errors here, there's not much we can do about them flock($this->stream, LOCK_EX); } fwrite($this->stream, (string) $record['formatted']); - if ($this->preferLocking) { + if ($this->useLocking) { flock($this->stream, LOCK_UN); } }