From 480295015a4363bca5ed5494b5d645fad04ac284 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Mon, 29 Dec 2014 08:40:39 -0600 Subject: [PATCH] MAGETWO-31850: [GITHUB] install.log can not be created with open_basedir restriction #796 - reverting few changes in weblogger --- .../Magento/Setup/src/Model/WebLogger.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 133c932c50e27..43f2c05d9a4db 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -18,9 +18,9 @@ class WebLogger implements LoggerInterface /** * Log File * - * @const string + * @var string */ - const LOG_WEB = 'install.log'; + protected $logFile = 'install.log'; /** * Currently open file resource @@ -46,10 +46,14 @@ class WebLogger implements LoggerInterface /** * Constructor * @param Filesystem $filesystem + * @param string $logFile */ - public function __construct(Filesystem $filesystem) + public function __construct(Filesystem $filesystem, $logFile = null) { $this->directory = $filesystem->getDirectoryWrite(DirectoryList::LOG); + if ($logFile) { + $this->logFile = $logFile; + } } /** @@ -105,7 +109,7 @@ public function logMeta($message) */ private function writeToFile($message) { - $this->directory->writeFile(self::LOG_WEB, $message, 'a+'); + $this->directory->writeFile($this->logFile, $message, 'a+'); } /** @@ -115,7 +119,7 @@ private function writeToFile($message) */ public function get() { - $fileContents = explode('\n', $this->directory->readFile(self::LOG_WEB)); + $fileContents = explode('\n', $this->directory->readFile($this->logFile)); return $fileContents; } @@ -126,8 +130,8 @@ public function get() */ public function clear() { - if ($this->directory->isExist(self::LOG_WEB)) { - $this->directory->delete(self::LOG_WEB); + if ($this->directory->isExist($this->logFile)) { + $this->directory->delete($this->logFile); } }