From c4ce22e27829eb7fd1cf7c22896bc29c4ae92279 Mon Sep 17 00:00:00 2001 From: Ralf Siepker Date: Wed, 24 Aug 2016 10:20:53 +0200 Subject: [PATCH] PW-1799 make logging configurable --- .../Cloudinary/Cloudinary/Model/Logger.php | 35 +++++++++++++++++-- .../Cloudinary/Cloudinary/etc/config.xml | 4 +++ .../Cloudinary/Cloudinary/etc/system.xml | 19 ++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/app/code/community/Cloudinary/Cloudinary/Model/Logger.php b/src/app/code/community/Cloudinary/Cloudinary/Model/Logger.php index d86f510..e33ff0b 100755 --- a/src/app/code/community/Cloudinary/Cloudinary/Model/Logger.php +++ b/src/app/code/community/Cloudinary/Cloudinary/Model/Logger.php @@ -6,17 +6,23 @@ class Cloudinary_Cloudinary_Model_Logger extends Mage_Core_Model_Abstract implem public function warning($message, array $context = array()) { - Mage::log($message, Zend_Log::WARN); + if ($this->isActive()) { + Mage::log($message, Zend_Log::WARN, $this->getFilename()); + } } public function notice($message, array $context = array()) { - Mage::log($message, Zend_Log::NOTICE); + if ($this->isActive()) { + Mage::log($message, Zend_Log::NOTICE, $this->getFilename()); + } } public function error($message, array $context = array()) { - Mage::log($message, Zend_Log::ERR); + if ($this->isActive()) { + Mage::log($message, Zend_Log::ERR, $this->getFilename()); + } } public function debugLog($message) @@ -45,4 +51,27 @@ public static function getInstance() { return Mage::getModel('cloudinary_cloudinary/logger'); } + + /** + * check is logging is enabled + * @return bool + */ + public function isActive() + { + return Mage::getStoreConfigFlag('cloudinary/log/actice'); + } + + /** + * return filename where to log data + * @return mixed|string + */ + public function getFilename() + { + $filename = Mage::getStoreConfig('cloudinary/log/filename'); + if (empty($filename)) { + $filename = Mage::getStoreConfig('dev/log/file'); + } + + return $filename; + } } diff --git a/src/app/code/community/Cloudinary/Cloudinary/etc/config.xml b/src/app/code/community/Cloudinary/Cloudinary/etc/config.xml index 35433cc..ccd8ad9 100755 --- a/src/app/code/community/Cloudinary/Cloudinary/etc/config.xml +++ b/src/app/code/community/Cloudinary/Cloudinary/etc/config.xml @@ -149,6 +149,10 @@ 1 + + 1 + cloudinary.log + diff --git a/src/app/code/community/Cloudinary/Cloudinary/etc/system.xml b/src/app/code/community/Cloudinary/Cloudinary/etc/system.xml index df4ac10..b07c22c 100755 --- a/src/app/code/community/Cloudinary/Cloudinary/etc/system.xml +++ b/src/app/code/community/Cloudinary/Cloudinary/etc/system.xml @@ -115,6 +115,25 @@ + + + + select + 1 + 1 + 1 + 1 + adminhtml/system_config_source_yesno + + + + text + 1 + 1 + 1 + 1 + +