work

fballiano · fballiano · commit 76a2a1e8427b · 2025-08-05T23:27:12.000+01:00
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
@@ -299,7 +299,7 @@
             </translate_inline>
             <log>
                 <active>0</active>
-                <max_level>100</max_level>
+                <min_level>100</min_level>
             </log>
             <js>
                 <defer_mode>0</defer_mode>
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
@@ -625,17 +625,17 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </active>
-                        <max_level translate="label comment">
-                            <label>Maximum Log Level</label>
+                        <min_level translate="label comment">
+                            <label>Minimum Log Severity</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_log_level</source_model>
                             <sort_order>2</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
-                            <comment>Messages with a priority lower than the selected one will not be logged. Log Levels are ordered from highest to lowest priority.</comment>
+                            <comment>Only messages at this severity level or higher will be logged. For example, selecting "Error" will log Error, Critical, Alert, and Emergency messages, but not Warning, Notice, Info, or Debug. Note: Developer mode overrides this setting and logs all levels.</comment>
                             <depends><active>1</active></depends>
-                        </max_level>
+                        </min_level>
                     </fields>
                 </log>
                 <css translate="label">
diff --git a/app/code/core/Mage/Core/sql/maho_setup/maho-25.08.0.php b/app/code/core/Mage/Core/sql/maho_setup/maho-25.08.0.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Maho
+ *
+ * @category   Mage
+ * @package    Mage_Core
+ * @copyright  Copyright (c) 2025 Maho (https://mahocommerce.com)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var Mage_Core_Model_Resource_Setup $installer */
+$installer = $this;
+
+$installer->startSetup();
+
+// Migrate dev/log/max_level to dev/log/min_level
+$connection = $installer->getConnection();
+$configTable = $installer->getTable('core/config_data');
+
+// Check if max_level exists
+$select = $connection->select()
+    ->from($configTable)
+    ->where('path = ?', 'dev/log/max_level');
+
+$maxLevelConfigs = $connection->fetchAll($select);
+
+foreach ($maxLevelConfigs as $config) {
+    // Convert old Zend_Log levels (0-7) to new Monolog levels
+    $oldValue = (int) $config['value'];
+    $newValue = match ($oldValue) {
+        0 => 600, // Emergency (was EMERG)
+        1 => 550, // Alert
+        2 => 500, // Critical (was CRIT)
+        3 => 400, // Error (was ERR)
+        4 => 300, // Warning (was WARN)
+        5 => 250, // Notice
+        6 => 200, // Info
+        7 => 100, // Debug
+        default => 100, // Default to Debug
+    };
+
+    // Insert new min_level config
+    $connection->insertOnDuplicate(
+        $configTable,
+        [
+            'scope' => $config['scope'],
+            'scope_id' => $config['scope_id'],
+            'path' => 'dev/log/min_level',
+            'value' => $newValue,
+        ],
+        ['value']
+    );
+}
+
+// Delete old max_level configs
+$connection->delete($configTable, ['path = ?' => 'dev/log/max_level']);
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php
@@ -78,7 +78,7 @@ public function log(mixed $message, Level|int|null $level = null, string $file =
         // Check if XML log configuration exists - if so, bypass backend settings
         if (self::isLogConfigManagedByXml()) {
             $logActive = true;
-            $maxLogLevel = Mage::LOG_DEBUG; // XML handlers manage their own levels
+            $minLogLevel = Mage::LOG_DEBUG; // XML handlers manage their own levels
             if (empty($file)) {
                 $file = 'system.log'; // Default file when using XML config
             }
@@ -95,9 +95,9 @@ public function log(mixed $message, Level|int|null $level = null, string $file =
             }
 
             try {
-                $maxLogLevel = (int) Mage::getStoreConfig('dev/log/max_level');
+                $minLogLevel = (int) Mage::getStoreConfig('dev/log/min_level');
             } catch (Throwable $e) {
-                $maxLogLevel = Mage::LOG_DEBUG;
+                $minLogLevel = Mage::LOG_DEBUG;
             }
         }
 
@@ -110,8 +110,8 @@ public function log(mixed $message, Level|int|null $level = null, string $file =
         if (!Mage::getIsDeveloperMode() && !$forceLog) {
             // Convert levels for comparison
             $levelValue = self::convertLogLevel($level);
-            $maxLevelValue = self::convertLogLevel($maxLogLevel);
-            if ($levelValue->value > $maxLevelValue->value) {
+            $minLevelValue = self::convertLogLevel($minLogLevel);
+            if ($levelValue->value < $minLevelValue->value) {
                 return;
             }
         }
@@ -124,7 +124,7 @@ public function log(mixed $message, Level|int|null $level = null, string $file =
 
         // Get or create logger
         if (!isset(self::$_loggers[$file])) {
-            $this->createLogger($file, $maxLogLevel, $forceLog);
+            $this->createLogger($file, $minLogLevel, $forceLog);
         }
 
         if (is_array($message) || is_object($message)) {
@@ -139,7 +139,7 @@ public function log(mixed $message, Level|int|null $level = null, string $file =
         self::$_loggers[$file]->log($monologLevel, $message);
     }
 
-    protected function createLogger(string $file, Level|int $maxLogLevel, bool $forceLog): void
+    protected function createLogger(string $file, Level|int $minLogLevel, bool $forceLog): void
     {
         $logDir = Mage::getBaseDir('var') . DS . 'log';
         $logFile = $logDir . DS . $file;
@@ -151,7 +151,7 @@ protected function createLogger(string $file, Level|int $maxLogLevel, bool $forc
         $logger = new Logger('Maho');
 
         // Convert old Zend_Log level to Monolog level for configuration
-        $configLevel = self::convertLogLevel($maxLogLevel);
+        $configLevel = self::convertLogLevel($minLogLevel);
         if ($forceLog || Mage::getIsDeveloperMode()) {
             $configLevel = Level::Debug;
         }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function log(mixed $message, Level\|int\|null $level = null, string $file =`
`78`	`78`	`// Check if XML log configuration exists - if so, bypass backend settings`
`79`	`79`	`if (self::isLogConfigManagedByXml()) {`
`80`	`80`	`$logActive = true;`
`81`		`- $maxLogLevel = Mage::LOG_DEBUG; // XML handlers manage their own levels`
	`81`	`+ $minLogLevel = Mage::LOG_DEBUG; // XML handlers manage their own levels`
`82`	`82`	`if (empty($file)) {`
`83`	`83`	`$file = 'system.log'; // Default file when using XML config`
`84`	`84`	`}`
`@@ -95,9 +95,9 @@ public function log(mixed $message, Level\|int\|null $level = null, string $file =`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`try {`
`98`		`- $maxLogLevel = (int) Mage::getStoreConfig('dev/log/max_level');`
	`98`	`+ $minLogLevel = (int) Mage::getStoreConfig('dev/log/min_level');`
`99`	`99`	`} catch (Throwable $e) {`
`100`		`- $maxLogLevel = Mage::LOG_DEBUG;`
	`100`	`+ $minLogLevel = Mage::LOG_DEBUG;`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -110,8 +110,8 @@ public function log(mixed $message, Level\|int\|null $level = null, string $file =`
`110`	`110`	`if (!Mage::getIsDeveloperMode() && !$forceLog) {`
`111`	`111`	`// Convert levels for comparison`
`112`	`112`	`$levelValue = self::convertLogLevel($level);`
`113`		`- $maxLevelValue = self::convertLogLevel($maxLogLevel);`
`114`		`- if ($levelValue->value > $maxLevelValue->value) {`
	`113`	`+ $minLevelValue = self::convertLogLevel($minLogLevel);`
	`114`	`+ if ($levelValue->value < $minLevelValue->value) {`
`115`	`115`	`return;`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -124,7 +124,7 @@ public function log(mixed $message, Level\|int\|null $level = null, string $file =`
`124`	`124`
`125`	`125`	`// Get or create logger`
`126`	`126`	`if (!isset(self::$_loggers[$file])) {`
`127`		`- $this->createLogger($file, $maxLogLevel, $forceLog);`
	`127`	`+ $this->createLogger($file, $minLogLevel, $forceLog);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if (is_array($message) \|\| is_object($message)) {`
`@@ -139,7 +139,7 @@ public function log(mixed $message, Level\|int\|null $level = null, string $file =`
`139`	`139`	`self::$_loggers[$file]->log($monologLevel, $message);`
`140`	`140`	`}`
`141`	`141`
`142`		`- protected function createLogger(string $file, Level\|int $maxLogLevel, bool $forceLog): void`
	`142`	`+ protected function createLogger(string $file, Level\|int $minLogLevel, bool $forceLog): void`
`143`	`143`	`{`
`144`	`144`	`$logDir = Mage::getBaseDir('var') . DS . 'log';`
`145`	`145`	`$logFile = $logDir . DS . $file;`
`@@ -151,7 +151,7 @@ protected function createLogger(string $file, Level\|int $maxLogLevel, bool $forc`
`151`	`151`	`$logger = new Logger('Maho');`
`152`	`152`
`153`	`153`	`// Convert old Zend_Log level to Monolog level for configuration`
`154`		`- $configLevel = self::convertLogLevel($maxLogLevel);`
	`154`	`+ $configLevel = self::convertLogLevel($minLogLevel);`
`155`	`155`	`if ($forceLog \|\| Mage::getIsDeveloperMode()) {`
`156`	`156`	`$configLevel = Level::Debug;`
`157`	`157`	`}`