Config Logger

Author: rldhont

lizmap/modules/lizmap/classes/lizmap.class.php

@@ -99,7 +99,7 @@ public static function getAppContext()
     public static function getLogger()
     {
         if (!self::$logger) {
-            self::$logger = new Logger();
+            self::$logger = new Logger(self::getServices()->logLevel);
         }
 
         return self::$logger;

lizmap/modules/lizmap/classes/lizmapServices.class.php

@@ -1,6 +1,8 @@
 <?php
 
+use Lizmap\Logger\Logger;
 use Lizmap\Server\Server;
+use Psr\Log\LogLevel;
 
 /**
  * Manage and give access to lizmap configuration.
@@ -52,6 +54,7 @@ class lizmapServices
         'requestProxyType',
         'requestProxyNotForDomain',
         'debugMode',
+        'logLevel',
         'cacheRootDirectory',
         'cacheRedisHost',
         'cacheRedisPort',
@@ -315,6 +318,13 @@ class lizmapServices
      */
     public $debugMode = '';
 
+    /**
+     * @var string Log level
+     *
+     * @see LogLevel
+     */
+    public $logLevel = Logger::DefaultLevel;
+
     /**
      * Cache root directory.
      *
@@ -452,6 +462,9 @@ public function __construct($readConfigPath, $globalConfig, $ldapEnabled, $varPa
             }
         }
 
+        // Check log level property
+        $this->checkLogLevel();
+
         if (!is_array($this->wmsServerHeaders)) {
             $this->wmsServerHeaders = array();
         }
@@ -618,9 +631,33 @@ public function modify($data)
             }
         }
 
+        $this->checkLogLevel();
+
         return $modified;
     }
 
+    /**
+     * Checking the log level property and update it if necessary.
+     */
+    protected function checkLogLevel(): string
+    {
+        // check log level
+        if (is_numeric($this->logLevel)) {
+            $logLevel = (int) $this->logLevel;
+            if ($logLevel < 0) {
+                $this->logLevel = Logger::LogLevels[0];
+            } elseif ($logLevel > 7) {
+                $this->logLevel = Logger::LogLevels[7];
+            } else {
+                $this->logLevel = Logger::LogLevels[$logLevel];
+            }
+        } elseif (!in_array($this->logLevel, Logger::LogLevels)) {
+            $this->logLevel = Logger::DefaultLevel;
+        }
+
+        return $this->logLevel;
+    }
+
     /**
      * Host URL to the Lizmap QGIS Server API, taking care of the QGIS Server context : FCGI, QJazz, etc.
      *

tests/units/classes/lizmapServicesTest.php

@@ -235,11 +235,23 @@ public static function getModifyLocalData()
             'adminContactEmail' => '[email protected]',
             'debugMode' => 'off',
         );
+        $testModify4_1 = array(
+            'appName' => 'Lizmap',
+            'adminContactEmail' => '[email protected]',
+            'logLevel' => 'debug',
+        );
+        $testModify5_1 = array(
+            'appName' => 'Lizmap',
+            'adminContactEmail' => '[email protected]',
+            'logLevel' => '1',
+        );
 
         return array(
             array($testModify1, $testModify1_1, null, null, true),
             array($testModify1, $testModify2_1, 'adminContactEmail', '[email protected]', true),
             array($testModify1, $testModify3_1, 'debugMode', 'off', true),
+            array($testModify1, $testModify4_1, 'logLevel', 'debug', true),
+            array($testModify1, $testModify5_1, 'logLevel', 'alert', true),
             array($testModify1, null, null, null, false),
             array($testModify2, $testModify1_1, 'adminContactEmail', '[email protected]', true),
             array(null, $testModify1_1, 'adminContactEmail', '[email protected]', true),
@@ -325,6 +337,7 @@ public function testSaveIntoIni($dataModification, $expectedIniValues, $expected
             'requestProxyNotForDomain',
             'cacheRedisHost',
             'cacheRedisPort',
+            'logLevel',
         );
 
         $testLizmapServices = new LizmapServices(