diff --git a/RoboFile.php b/RoboFile.php index b0657a7f44..20a7602e23 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -289,7 +289,7 @@ class RoboFile extends \Robo\Tasks { './vendor/bin/phpcs '. '--standard=./tasks/code_sniffer/MailPoet '. '--runtime-set testVersion 5.5-7.2 '. - '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'. + '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,./lib/Dependencies/*,'. './lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '. 'lib/ '. $severityFlag diff --git a/lib/Logging/LogHandler.php b/lib/Logging/LogHandler.php index 391ad289f9..d0fe04a841 100644 --- a/lib/Logging/LogHandler.php +++ b/lib/Logging/LogHandler.php @@ -12,12 +12,12 @@ class LogHandler extends AbstractProcessingHandler { * Percentage value, what is the probability of running purge routine * @var int */ - CONST LOG_PURGE_PROBABILITY = 5; + const LOG_PURGE_PROBABILITY = 5; /** * Logs older than this many days will be deleted */ - CONST DAYS_TO_KEEP_LOGS = 30; + const DAYS_TO_KEEP_LOGS = 30; protected function write(array $record) { $model = Log::create(); diff --git a/lib/Logging/Logger.php b/lib/Logging/Logger.php index 9f6d8e03e8..22cfd4c49e 100644 --- a/lib/Logging/Logger.php +++ b/lib/Logging/Logger.php @@ -5,6 +5,7 @@ namespace MailPoet\Logging; use MailPoet\Dependencies\Monolog\Processor\IntrospectionProcessor; use MailPoet\Dependencies\Monolog\Processor\MemoryUsageProcessor; use MailPoet\Dependencies\Monolog\Processor\WebProcessor; +use MailPoet\Models\Setting; class Logger { @@ -30,9 +31,21 @@ class Logger { self::$instance[$name]->pushProcessor(new MemoryUsageProcessor()); } - self::$instance[$name]->pushHandler(new LogHandler()); + self::$instance[$name]->pushHandler(new LogHandler(self::getDefaultLogLevel())); } return self::$instance[$name]; } + private static function getDefaultLogLevel() { + $settings = Setting::getValue('logging', 'errors'); + switch ($settings) { + case 'everything': + return \MailPoet\Dependencies\Monolog\Logger::DEBUG; + case 'nothing': + return \MailPoet\Dependencies\Monolog\Logger::EMERGENCY; + default: + return \MailPoet\Dependencies\Monolog\Logger::ERROR; + } + } + } \ No newline at end of file diff --git a/views/settings/advanced.html b/views/settings/advanced.html index 8a4406393f..ee17afe3fb 100644 --- a/views/settings/advanced.html +++ b/views/settings/advanced.html @@ -244,5 +244,34 @@
+ ++ <%= __('Enables logging for diagnostics of plugin behavior.') %> +