From 0cacd89313d7a8e3b11f9d636e78f6580cf0fd3b Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Tue, 24 Jun 2025 17:00:54 +0200
Subject: [PATCH 1/4] Start Psr-3 Logger

Require psr/log:2.* because psr/log 3.* is in conflict with symfony/console v5.4.47

```
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - symfony/console v5.4.47 conflicts with psr/log 3.0.2.
    - symfony/console v5.4.47 conflicts with psr/log 3.0.1.
    - symfony/console v5.4.47 conflicts with psr/log 3.0.0.
    - jelix/jelix dev-jelix-1.8.x requires symfony/console ^5.4.26 -> satisfiable by symfony/console[v5.4.47].
    - jelix/jelix is locked to version dev-jelix-1.8.x and an update of this package was not requested.
    - Root composer.json requires psr/log ^3.0 -> satisfiable by psr/log[3.0.0, 3.0.1, 3.0.2].

```

symfony/console could not be updated to version v7 because jelix-1.8.x requires symfony/console ^5.4.26
---
 lizmap/composer.json                        |  3 ++-
 lizmap/modules/lizmap/lib/Logger/Logger.php | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 lizmap/modules/lizmap/lib/Logger/Logger.php

diff --git a/lizmap/composer.json b/lizmap/composer.json
index eaf9dd494a..77708b995d 100644
--- a/lizmap/composer.json
+++ b/lizmap/composer.json
@@ -15,7 +15,8 @@
     "violet/streaming-json-encoder": "^1.1.5",
     "guzzlehttp/guzzle": "^7.7.0",
     "halaxa/json-machine": "^1.1",
-    "kevinrob/guzzle-cache-middleware": "^6.0"
+    "kevinrob/guzzle-cache-middleware": "^6.0",
+    "psr/log": "2.*"
   },
   "minimum-stability": "stable",
   "config": {
diff --git a/lizmap/modules/lizmap/lib/Logger/Logger.php b/lizmap/modules/lizmap/lib/Logger/Logger.php
new file mode 100644
index 0000000000..a75ecf5f97
--- /dev/null
+++ b/lizmap/modules/lizmap/lib/Logger/Logger.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Lizmap\Logger;
+
+use Psr\Log\AbstractLogger;
+use Psr\Log\InvalidArgumentException;
+
+class Logger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     *
+     * @throws InvalidArgumentException
+     */
+    public function log($level, string|\Stringable $message, array $context = array())
+    {
+        \jLog::log($message, $level);
+    }
+}

From ec2c4d1fe8b2ccb39f72f83684cae55ec155bd4f Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Tue, 24 Jun 2025 17:32:48 +0200
Subject: [PATCH 2/4] Update Logger

---
 lizmap/app/system/mainconfig.ini.php        |  10 ++
 lizmap/modules/lizmap/lib/Logger/Logger.php | 139 +++++++++++++++++++-
 tests/units/classes/Log/LoggerTest.php      | 137 +++++++++++++++++++
 3 files changed, 284 insertions(+), 2 deletions(-)
 create mode 100644 tests/units/classes/Log/LoggerTest.php

diff --git a/lizmap/app/system/mainconfig.ini.php b/lizmap/app/system/mainconfig.ini.php
index ef99e4673d..c80beefa90 100644
--- a/lizmap/app/system/mainconfig.ini.php
+++ b/lizmap/app/system/mainconfig.ini.php
@@ -191,9 +191,14 @@
 [logger]
 _all=
 default=file
+emergency=file
+alert=file
+critical=file
 error=file
 warning=file
 notice=file
+info=file
+debug=file
 ;deprecated=syslog
 strict=file
 ;sql=syslog
@@ -203,9 +208,14 @@
 
 [fileLogger]
 default=messages.log
+emergency=errors.log
+alert=errors.log
+critical=errors.log
 error=errors.log
 warning=errors.log
 notice=errors.log
+info=errors.log
+debug=errors.log
 strict=errors.log
 ;metric=time.log
 auth=messages.log
diff --git a/lizmap/modules/lizmap/lib/Logger/Logger.php b/lizmap/modules/lizmap/lib/Logger/Logger.php
index a75ecf5f97..12f2855b32 100644
--- a/lizmap/modules/lizmap/lib/Logger/Logger.php
+++ b/lizmap/modules/lizmap/lib/Logger/Logger.php
@@ -4,9 +4,109 @@
 
 use Psr\Log\AbstractLogger;
 use Psr\Log\InvalidArgumentException;
+use Psr\Log\LogLevel;
 
+/**
+ * Logger is an implementation of the PSR-3 Logger Interface.
+ *
+ * This logger wraps \jLog with a log level.
+ *
+ * @author 3liz
+ *
+ * @see https://www.php-fig.org/psr/psr-3/
+ * @see https://jelix.org/documentation/jelix/1.8/api/jLog
+ */
 class Logger extends AbstractLogger
 {
+    /**
+     * Levels ordered from most important to least important
+     * as defined in RFC 5424.
+     *
+     * @var string[]
+     *
+     * @see LogLevel
+     */
+    public const LogLevels = array(
+        LogLevel::EMERGENCY,
+        LogLevel::ALERT,
+        LogLevel::CRITICAL,
+        LogLevel::ERROR,
+        LogLevel::WARNING,
+        LogLevel::NOTICE,
+        LogLevel::INFO,
+        LogLevel::DEBUG,
+    );
+
+    /**
+     * The default log level: error.
+     *
+     * @var string
+     */
+    public const DefaultLevel = LogLevel::ERROR;
+
+    /**
+     * The minimum logging level at which this logger will be used.
+     *
+     * @var string
+     */
+    protected $level;
+
+    /**
+     * Initialise the logger with a log level.
+     *
+     * @param string $level The minimum logging level at which this logger will be used
+     *
+     * @throws InvalidArgumentException
+     *
+     * @see LogLevel
+     * @see setLevel()
+     * @see https://www.php-fig.org/psr/psr-3/#5-psrlogloglevel
+     */
+    public function __construct(string $level = LogLevel::ERROR)
+    {
+        if (!in_array($level, self::LogLevels)) {
+            throw new InvalidArgumentException('Invalid log level');
+        }
+        $this->level = $level;
+    }
+
+    /**
+     * Get log level.
+     */
+    public function getLevel(): string
+    {
+        return $this->level;
+    }
+
+    /**
+     * Set log level.
+     *
+     * @param string $level
+     *
+     * @throws InvalidArgumentException
+     */
+    public function setLevel($level): void
+    {
+        if (!in_array($level, self::LogLevels)) {
+            throw new InvalidArgumentException('Invalid log level');
+        }
+        $this->level = $level;
+    }
+
+    /**
+     * Check if the given level is high enough to be logged.
+     *
+     * This is used to avoid unnecessary logging.
+     * For example, if the logger is set to LogLevel::ERROR, then LogLevel::INFO will not be logged.
+     * But LogLevel::ERROR will be logged.
+     * if the level is not in the list of LogLevels, it will be considered as not high enough.
+     */
+    public function isLevelHighEnough(string $level): bool
+    {
+        return in_array($level, self::LogLevels)
+            && array_search($level, self::LogLevels) <= array_search($this->level, self::LogLevels);
+    }
+
     /**
      * Logs with an arbitrary level.
      *
@@ -14,8 +114,43 @@ class Logger extends AbstractLogger
      *
      * @throws InvalidArgumentException
      */
-    public function log($level, string|\Stringable $message, array $context = array())
+    public function log($level, string|\Stringable $message, array $context = array()): void
     {
-        \jLog::log($message, $level);
+        if (!in_array($level, self::LogLevels)) {
+            throw new InvalidArgumentException('Invalid log level');
+        }
+
+        // If the level is not high enough, return early.
+        if ($this->isLevelHighEnough($level)) {
+            return;
+        }
+
+        \jLog::log(
+            $this->interpolate((string) $message, $context),
+            $level
+        );
+    }
+
+    /**
+     * Interpolates context values into message placeholders according to PSR-3 rules.
+     *
+     * This method replaces placeholders in the message with actual values
+     * from the context array.
+     *
+     * @param string $message Message with placeholders
+     * @param array  $context Values to replace placeholders
+     *
+     * @return string Interpolated message
+     *
+     * @see https://www.php-fig.org/psr/psr-3/#12-message
+     */
+    private function interpolate(string $message, array $context = array()): string
+    {
+        $replace = array();
+        foreach ($context as $key => $val) {
+            $replace['{'.$key.'}'] = $val;
+        }
+
+        return strtr($message, $replace);
     }
 }
diff --git a/tests/units/classes/Log/LoggerTest.php b/tests/units/classes/Log/LoggerTest.php
new file mode 100644
index 0000000000..07c3e90ee1
--- /dev/null
+++ b/tests/units/classes/Log/LoggerTest.php
@@ -0,0 +1,137 @@
+<?php
+
+use Lizmap\Logger\Logger;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\InvalidArgumentException;
+use Psr\Log\LogLevel;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class LoggerTest extends TestCase
+{
+    public function testDefault(): void
+    {
+        $logger = new Logger();
+        $this->assertInstanceOf(Logger::class, $logger);
+        $this->assertEquals(Logger::DefaultLevel, $logger->getLevel());
+        $this->assertEquals(LogLevel::ERROR, $logger->getLevel());
+
+        $this->assertTrue($logger->isLevelHighEnough('error'));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::EMERGENCY));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::CRITICAL));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ALERT));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ERROR));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::WARNING));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::NOTICE));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::INFO));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::DEBUG));
+
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[0]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[1]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[2]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[3]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[4]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[5]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[6]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[7]));
+        $this->assertFalse($logger->isLevelHighEnough('default'));
+    }
+
+    public function testConstruct(): void
+    {
+        $logger = new Logger(LogLevel::EMERGENCY);
+        $this->assertInstanceOf(Logger::class, $logger);
+        $this->assertEquals(LogLevel::EMERGENCY, $logger->getLevel());
+        $this->assertNotEquals(Logger::DefaultLevel, $logger->getLevel());
+
+        $this->assertTrue($logger->isLevelHighEnough('emergency'));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::EMERGENCY));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::CRITICAL));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::ALERT));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::ERROR));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::WARNING));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::NOTICE));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::INFO));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::DEBUG));
+
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[0]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[1]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[2]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[3]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[4]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[5]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[6]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[7]));
+        $this->assertFalse($logger->isLevelHighEnough('default'));
+
+        $logger = new Logger(LogLevel::DEBUG);
+        $this->assertInstanceOf(Logger::class, $logger);
+        $this->assertEquals(LogLevel::DEBUG, $logger->getLevel());
+        $this->assertNotEquals(Logger::DefaultLevel, $logger->getLevel());
+
+        $this->assertTrue($logger->isLevelHighEnough('debug'));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::EMERGENCY));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::CRITICAL));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ALERT));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ERROR));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::WARNING));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::NOTICE));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::INFO));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::DEBUG));
+
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[0]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[1]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[2]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[3]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[4]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[5]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[6]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[7]));
+        $this->assertFalse($logger->isLevelHighEnough('default'));
+
+        $logger = new Logger('warning');
+        $this->assertInstanceOf(Logger::class, $logger);
+        $this->assertEquals(LogLevel::WARNING, $logger->getLevel());
+        $this->assertNotEquals(Logger::DefaultLevel, $logger->getLevel());
+
+        $this->assertTrue($logger->isLevelHighEnough('error'));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::EMERGENCY));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::CRITICAL));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ALERT));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::ERROR));
+        $this->assertTrue($logger->isLevelHighEnough(LogLevel::WARNING));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::NOTICE));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::INFO));
+        $this->assertFalse($logger->isLevelHighEnough(LogLevel::DEBUG));
+
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[0]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[1]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[2]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[3]));
+        $this->assertTrue($logger->isLevelHighEnough(Logger::LogLevels[4]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[5]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[6]));
+        $this->assertFalse($logger->isLevelHighEnough(Logger::LogLevels[7]));
+        $this->assertFalse($logger->isLevelHighEnough('default'));
+    }
+
+    public function testInvalidArgument(): void
+    {
+        $logger = new Logger();
+        $this->assertInstanceOf(Logger::class, $logger);
+        $this->expectException(InvalidArgumentException::class);
+        $logger->log('invalid', 'message');
+
+        $this->expectException(InvalidArgumentException::class);
+        $logger->isLevelHighEnough('invalid');
+
+        $this->expectException(InvalidArgumentException::class);
+        $logger->setLevel('invalid');
+
+        $this->expectException(InvalidArgumentException::class);
+        $invalidLogger = new Logger('invalid');
+    }
+}

From 828c28ee9f041a59b79495045db15093ab200d40 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Wed, 25 Jun 2025 18:54:36 +0200
Subject: [PATCH 3/4] Using the new Logger

---
 .../modules/lizmap/classes/lizmap.class.php   | 20 ++++++++++++++++++-
 .../modules/lizmap/lib/App/JelixContext.php   | 15 ++++++++++++--
 ...QgisFormValueRelationDynamicDatasource.php |  5 ++++-
 .../lizmap/lib/Project/ProjectConfig.php      |  2 +-
 .../lizmap/lib/Project/QgisProject.php        |  7 +++++--
 .../modules/lizmap/lib/Request/OGCRequest.php |  6 +++---
 lizmap/modules/lizmap/lib/Request/Proxy.php   | 13 +++++++-----
 .../lib/Request/RequestCacheStorage.php       |  4 ++--
 .../modules/lizmap/lib/Request/WMSRequest.php | 16 +++++++--------
 .../lizmap/lib/Request/WMTSRequest.php        |  2 +-
 10 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/lizmap/modules/lizmap/classes/lizmap.class.php b/lizmap/modules/lizmap/classes/lizmap.class.php
index cccdf14426..a71846e106 100644
--- a/lizmap/modules/lizmap/classes/lizmap.class.php
+++ b/lizmap/modules/lizmap/classes/lizmap.class.php
@@ -16,6 +16,7 @@
 use Lizmap\Logger as Log;
 use Lizmap\Logger\Config as LogConfig;
 use Lizmap\Logger\Item as LogItem;
+use Lizmap\Logger\Logger;
 use Lizmap\Project\Project;
 
 /**
@@ -54,6 +55,11 @@ class lizmap
      */
     protected static $appContext;
 
+    /**
+     * @var null|Logger The logger instance
+     */
+    protected static $logger;
+
     /**
      * this is a static class, so private constructor.
      */
@@ -87,6 +93,18 @@ public static function getAppContext()
         return self::$appContext;
     }
 
+    /**
+     * @return Logger The logger instance
+     */
+    public static function getLogger()
+    {
+        if (!self::$logger) {
+            self::$logger = new Logger();
+        }
+
+        return self::$logger;
+    }
+
     public static function saveServices()
     {
         $ini = new IniModifier(jApp::varConfigPath('lizmapConfig.ini.php'));
@@ -495,6 +513,6 @@ public static function logMetric($label, $service, $payload = array())
 
         $logMessage = new Log\MetricsLogMessage($log, 'metric');
 
-        jLog::log($logMessage);
+        self::getLogger()->info($logMessage);
     }
 }
diff --git a/lizmap/modules/lizmap/lib/App/JelixContext.php b/lizmap/modules/lizmap/lib/App/JelixContext.php
index b3c225f721..1832a2b373 100644
--- a/lizmap/modules/lizmap/lib/App/JelixContext.php
+++ b/lizmap/modules/lizmap/lib/App/JelixContext.php
@@ -14,6 +14,7 @@
 namespace Lizmap\App;
 
 use Jelix\IniFile\IniModifier;
+use Lizmap\Logger\Logger;
 
 class JelixContext implements AppContextInterface
 {
@@ -210,7 +211,11 @@ public function flushCache($profile = '')
      */
     public function logMessage($message, $cat = 'default')
     {
-        \jLog::log($message, $cat);
+        if (in_array($cat, Logger::LogLevels)) {
+            \lizmap::getLogger()->log($cat, $message);
+        } else {
+            \jLog::log($message, $cat);
+        }
     }
 
     /**
@@ -221,7 +226,13 @@ public function logMessage($message, $cat = 'default')
      */
     public function logException($exception, $cat = 'default')
     {
-        \jLog::logEx($exception, $cat);
+        if (in_array($cat, Logger::LogLevels)) {
+            if (\lizmap::getLogger()->isLevelHighEnough($cat)) {
+                \jLog::logEx($exception, $cat);
+            }
+        } else {
+            \jLog::logEx($exception, $cat);
+        }
     }
 
     /**
diff --git a/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php b/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php
index 24dd3e9480..1a8b23c9f0 100644
--- a/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php
+++ b/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php
@@ -62,7 +62,10 @@ public function getData($form)
                             if ($wkt && \lizmapWkt::check($wkt)) {
                                 $geom = \lizmapWkt::parse($wkt);
                                 if ($geom === null) {
-                                    \jLog::log('Parsing WKT failed! '.$wkt, 'error');
+                                    \lizmap::getLogger()->error(
+                                        'Parsing WKT failed! {wkt}',
+                                        array('wkt' => $wkt)
+                                    );
                                 }
                             }
                         } else {
diff --git a/lizmap/modules/lizmap/lib/Project/ProjectConfig.php b/lizmap/modules/lizmap/lib/Project/ProjectConfig.php
index 57ff5008ba..c2fdd0fb0b 100644
--- a/lizmap/modules/lizmap/lib/Project/ProjectConfig.php
+++ b/lizmap/modules/lizmap/lib/Project/ProjectConfig.php
@@ -649,7 +649,7 @@ private function parseDatavizTreeNode($node, $level, $debug)
                 $active = ($n == 0) ? 'active' : '';
 
                 if ($debug) {
-                    \jLog::log("Node {$subNode->name} - n = {$n} ET active = {$active}");
+                    \lizmap::getLogger()->debug("Node {$subNode->name} - n = {$n} ET active = {$active}");
                 }
                 $item = $prefix.'    <li class="nav-item" role="presentation">';
                 $item .= $prefix.'    <button class="nav-link '.$active.'" data-bs-target="#dataviz-dnd-'.$level.'-'.md5($subNode->name);
diff --git a/lizmap/modules/lizmap/lib/Project/QgisProject.php b/lizmap/modules/lizmap/lib/Project/QgisProject.php
index faed59a84d..483a6dacd8 100644
--- a/lizmap/modules/lizmap/lib/Project/QgisProject.php
+++ b/lizmap/modules/lizmap/lib/Project/QgisProject.php
@@ -803,7 +803,7 @@ protected function getXml()
         if (!is_object($xml)) {
             $errormsg = '\n'.basename($qgs_path).'\n'.$xml;
             $errormsg = 'An error has been raised when loading QGIS Project:'.$errormsg;
-            \jLog::log($errormsg, 'lizmapadmin');
+            \lizmap::getAppContext()->logMessage($errormsg, 'lizmapadmin');
 
             throw new \Exception('The QGIS project '.basename($qgs_path).' has invalid content!');
         }
@@ -1421,7 +1421,10 @@ protected function getFieldConfiguration($layerXml)
 
             // Option + Attributes
             if (count((array) $options) > 2) {
-                \jLog::log('Project '.basename($this->path).': More than one Option found in the Qgis File for field '.$fieldName.', only the first will be read.', 'lizmapadmin');
+                $errormsg = 'Project '.basename($this->path);
+                $errormsg .= ': More than one Option found in the Qgis File for field ';
+                $errormsg .= $fieldName.', only the first will be read.';
+                \lizmap::getAppContext()->logMessage($errormsg, 'lizmapadmin');
             }
             $fieldEditOptions = $this->getFieldConfigurationOptions($options);
 
diff --git a/lizmap/modules/lizmap/lib/Request/OGCRequest.php b/lizmap/modules/lizmap/lib/Request/OGCRequest.php
index bcc0f6a417..40354c9fe9 100644
--- a/lizmap/modules/lizmap/lib/Request/OGCRequest.php
+++ b/lizmap/modules/lizmap/lib/Request/OGCRequest.php
@@ -255,7 +255,7 @@ protected function logRequestIfError($code, $headers)
         // The master error with MAP parameter
         // This user must have an access to QGIS Server logs
         $params = $this->parameters();
-        \jLog::log($message.' Check logs on QGIS Server. '.$this->formatHttpErrorString($params, $code), 'error');
+        \lizmap::getLogger()->error($message.' Check logs on QGIS Server. '.$this->formatHttpErrorString($params, $code));
 
         // The admin error without the MAP parameter
         // but replaced by REPOSITORY and PROJECT parameters
@@ -404,7 +404,7 @@ protected function process_getcapabilities()
         } catch (\Exception $e) {
             // if qgisprojects profile does not exist, or if there is an
             // other error about the cache, let's log it
-            \jLog::logEx($e, 'error');
+            \lizmap::getAppContext()->logException($e, 'error');
         }
         // return cached data
         if ($cached !== false) {
@@ -451,7 +451,7 @@ protected function loadXmlString($xmldata, $name)
             $errormsg = '\n'.$xmldata.'\n'.$xml;
             $errormsg = '\n'.http_build_query($this->params).$errormsg;
             $errormsg = 'An error has been raised when loading '.$name.':'.$errormsg;
-            \jLog::log($errormsg, 'lizmapadmin');
+            \lizmap::getAppContext()->logMessage($errormsg, 'lizmapadmin');
 
             return null;
         }
diff --git a/lizmap/modules/lizmap/lib/Request/Proxy.php b/lizmap/modules/lizmap/lib/Request/Proxy.php
index 9268481b93..06b09c8e59 100644
--- a/lizmap/modules/lizmap/lib/Request/Proxy.php
+++ b/lizmap/modules/lizmap/lib/Request/Proxy.php
@@ -128,7 +128,7 @@ public static function build($project, $params, $requestXml = null)
             if (!is_object($xml)) {
                 $errormsg = '\n'.$requestXml.'\n'.$xml;
                 $errormsg = 'An error has been raised when loading requestXml:'.$errormsg;
-                \jLog::log($errormsg, 'lizmapadmin');
+                self::getAppContext()->logMessage($errormsg, 'lizmapadmin');
                 $requestXml = null;
             } else {
                 $request = $xml->getName();
@@ -373,7 +373,7 @@ protected static function logRequestIfError($httpCode, $url, $headers = array())
             $error .= ' → '.$url;
         }
         \jLog::log($lizmapAdmin, 'lizmapadmin');
-        \jLog::log($error, 'error');
+        \lizmap::getLogger()->error($error);
     }
 
     /**
@@ -483,12 +483,12 @@ protected static function sendRequest($url, $options)
             $response = $client->send($request, $requestOptions);
         } catch (ConnectException $e) {
             // Handle connection timeout
-            \jLog::log('Connection failed: '.$e->getMessage(), 'error');
+            \lizmap::getLogger()->error('Connection failed: '.$e->getMessage());
             $response = new Response(504, array(), null, '1.1', 'HTTP/1.1 504 Gateway Timeout');
         } catch (RequestException $e) {
             // Handle transfer timeout
             // throwing exceptions on an HTTP protocol errors (i.e., 4xx and 5xx responses) has been disabled
-            \jLog::log('Request failed: '.$e->getMessage(), 'error');
+            \lizmap::getLogger()->error('Request failed: '.$e->getMessage());
             if ($e->hasResponse()) {
                 $response = $e->getResponse();
             }
@@ -702,7 +702,10 @@ public static function createVirtualProfile($repository, $project, $layers, $crs
         $cacheRootDirectory = $ser->cacheRootDirectory;
         if ($cacheStorageType != 'redis') {
             if (!is_dir($cacheRootDirectory) or !is_writable($cacheRootDirectory)) {
-                \jLog::log('cacheRootDirectory "'.$cacheRootDirectory.'" is not a directory or is not writable!', 'lizmapadmin');
+                self::getAppContext()->logMessage(
+                    'cacheRootDirectory "'.$cacheRootDirectory.'" is not a directory or is not writable!',
+                    'lizmapadmin'
+                );
                 $cacheRootDirectory = sys_get_temp_dir();
             }
         }
diff --git a/lizmap/modules/lizmap/lib/Request/RequestCacheStorage.php b/lizmap/modules/lizmap/lib/Request/RequestCacheStorage.php
index b70b8649f8..c4067403ee 100644
--- a/lizmap/modules/lizmap/lib/Request/RequestCacheStorage.php
+++ b/lizmap/modules/lizmap/lib/Request/RequestCacheStorage.php
@@ -44,7 +44,7 @@ public function fetch($key)
                 return $cache;
             }
         } catch (\Exception $ignored) {
-            \jLog::logEx($ignored, 'error');
+            \lizmap::getAppContext()->logException($ignored, 'error');
 
             return null;
         }
@@ -80,7 +80,7 @@ public function save($key, $data)
             }
         } catch (\Exception $ignored) {
             // No fail if we can't save it the storage
-            \jLog::logEx($ignored, 'error');
+            \lizmap::getAppContext()->logException($ignored, 'error');
         }
 
         return false;
diff --git a/lizmap/modules/lizmap/lib/Request/WMSRequest.php b/lizmap/modules/lizmap/lib/Request/WMSRequest.php
index 572254af61..cde7805ff0 100644
--- a/lizmap/modules/lizmap/lib/Request/WMSRequest.php
+++ b/lizmap/modules/lizmap/lib/Request/WMSRequest.php
@@ -122,12 +122,12 @@ protected function process_getcapabilities()
         $data = $result->data;
         if (empty($data) or floor($result->code / 100) >= 4) {
             if (empty($data)) {
-                \jLog::log(
+                \lizmap::getAppContext()->logMessage(
                     'Error in project '.$this->repository->getKey().'/'.$this->project->getKey().': GetCapabilities empty data',
                     'lizmapadmin'
                 );
             } else {
-                \jLog::log(
+                \lizmap::getAppContext()->logMessage(
                     'Error in project '.$this->repository->getKey().'/'.$this->project->getKey().': GetCapabilities result code: '.$result->code,
                     'lizmapadmin'
                 );
@@ -324,7 +324,7 @@ protected function process_getlegendgraphic()
                 } catch (\Exception $e) {
                     // if qgisprojects profile does not exist, or if there is an
                     // other error about the cache, let's log it
-                    \jLog::logEx($e, 'error');
+                    \lizmap::getAppContext()->logException($e, 'error');
                 }
                 // return cached data
                 if ($cached !== false) {
@@ -1032,7 +1032,7 @@ protected function getVProfileInfos($configLayer, $repository, $project)
                     return array('error', 'text/plain');
                 }
             } catch (UnknownLizmapProjectException $e) {
-                \jLog::logEx($e, 'error');
+                \lizmap::getAppContext()->logException($e, 'error');
                 \jMessage::add('The lizmap project '.strtoupper($project).' does not exist !', 'ProjectNotDefined');
 
                 return array('error', 'text/plain');
@@ -1068,7 +1068,7 @@ protected function useCache($configLayer, $params, $profile)
                     $useCache = false;
                 }
             } catch (\Exception $e) {
-                \jLog::logEx($e, 'error');
+                \lizmap::getAppContext()->logException($e, 'error');
                 $useCache = false;
             }
         }
@@ -1110,7 +1110,7 @@ public function getTileCache($params, $profile, $useCache, $forced, $debug = fal
             try {
                 $tile = $this->appContext->getCache($key, $profile);
             } catch (\Exception $e) {
-                \jLog::logEx($e, 'error');
+                \lizmap::getAppContext()->logException($e, 'error');
                 $tile = false;
             }
             if ($tile) {
@@ -1347,7 +1347,7 @@ protected function getMapData($project, $params, $forced = false)
         // Store into cache if needed
         $cached = false;
         if ($useCache) {
-            // ~ \jLog::log( ' Store into cache');
+            \lizmap::getLogger()->debug(' Store into cache');
             $cacheExpiration = (int) $this->services->cacheExpiration;
             if (property_exists($configLayer, 'cacheExpiration')) {
                 $cacheExpiration = (int) $configLayer->cacheExpiration;
@@ -1361,7 +1361,7 @@ protected function getMapData($project, $params, $forced = false)
                     'qgisParams' => $params,
                 ));
             } catch (\Exception $e) {
-                \jLog::logEx($e, 'error');
+                \lizmap::getAppContext()->logException($e, 'error');
                 $cached = false;
             }
         }
diff --git a/lizmap/modules/lizmap/lib/Request/WMTSRequest.php b/lizmap/modules/lizmap/lib/Request/WMTSRequest.php
index 4759210cfb..43b3dedb23 100644
--- a/lizmap/modules/lizmap/lib/Request/WMTSRequest.php
+++ b/lizmap/modules/lizmap/lib/Request/WMTSRequest.php
@@ -93,7 +93,7 @@ protected function process_getcapabilities()
      */
     protected function process_gettile()
     {
-        // \jLog::log('GetTile '.http_build_query($this->params));
+        \lizmap::getLogger()->debug('GetTile '.http_build_query($this->params));
         // Get the parameters values
         $params = array(
             'LayerName' => 'Layer',

From 232ecadc094a5e73134c3a52ca492b70f235015d Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Thu, 26 Jun 2025 09:19:23 +0200
Subject: [PATCH 4/4] Config Logger

---
 docker/update-config.php                      |  7 +++
 .../admin/forms/config_services.form.xml      | 13 ++++++
 .../locales/en_US/admin.UTF-8.properties      | 10 ++++
 .../modules/lizmap/classes/lizmap.class.php   |  2 +-
 .../lizmap/classes/lizmapServices.class.php   | 46 +++++++++++++++++++
 tests/units/classes/lizmapServicesTest.php    | 13 ++++++
 6 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/docker/update-config.php b/docker/update-config.php
index e1ef98993d..a0f9e777e5 100644
--- a/docker/update-config.php
+++ b/docker/update-config.php
@@ -6,6 +6,7 @@
 
 /**
  * @param IniModifier $iniFileModifier
+ * @param mixed       $varname
  */
 function load_include_config($varname, $iniFileModifier)
 {
@@ -172,6 +173,12 @@ function checkAndWaitPostgresql($profilesConfig, $profileName, $nbRetries = 10,
 // DropIn capabilities: Merge all ini file in LIZMAP_LIZMAPCONFIG_INCLUDE
 load_include_config('LIZMAP_LIZMAPCONFIG_INCLUDE', $lizmapConfig);
 
+// Enable metrics
+$log_level = getenv('LIZMAP_LOGLEVEL');
+if (is_numeric($log_level) || $log_level !== '') {
+    $lizmapConfig->setValue('logLevel', $log_level, 'services');
+}
+
 // Enable metrics
 $logger_metric = getenv('LIZMAP_LOGMETRICS');
 if ($logger_metric !== false) {
diff --git a/lizmap/modules/admin/forms/config_services.form.xml b/lizmap/modules/admin/forms/config_services.form.xml
index 3240c5a6e3..b0788d0e64 100644
--- a/lizmap/modules/admin/forms/config_services.form.xml
+++ b/lizmap/modules/admin/forms/config_services.form.xml
@@ -114,6 +114,19 @@
         <item value="1" locale="admin~admin.form.admin_services.debugMode.1.label"/>
     </menulist>
 
+    <menulist ref="logLevel" required="true">
+        <label locale="admin~admin.form.admin_services.logLevel.label"/>
+        <help locale="admin~admin.form.admin_services.logLevel.help"/>
+        <item value="emergency" locale="admin~admin.form.admin_services.logLevel.emergency.label"/>
+        <item value="alert" locale="admin~admin.form.admin_services.logLevel.alert.label"/>
+        <item value="critical" locale="admin~admin.form.admin_services.logLevel.critical.label"/>
+        <item value="error" selected="true" locale="admin~admin.form.admin_services.logLevel.error.label"/>
+        <item value="warning" locale="admin~admin.form.admin_services.logLevel.warning.label"/>
+        <item value="notice" locale="admin~admin.form.admin_services.logLevel.notice.label"/>
+        <item value="info" locale="admin~admin.form.admin_services.logLevel.info.label"/>
+        <item value="debug" locale="admin~admin.form.admin_services.logLevel.debug.label"/>
+    </menulist>
+
     <group ref="requestProxyEnabled" withcheckbox="true">
         <oncheckvalue locale="admin~admin.form.admin_services.requestProxy.enabled" value="1"/>
         <onuncheckvalue locale="admin~admin.form.admin_services.requestProxy.disabled" value="0" />
diff --git a/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties b/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
index a2aec7f555..af3804ffb4 100644
--- a/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
+++ b/lizmap/modules/admin/locales/en_US/admin.UTF-8.properties
@@ -108,6 +108,16 @@ form.admin_services.requestProxyNotForDomain.label=Domains for which the proxy w
 form.admin_services.debugMode.label=Debug mode
 form.admin_services.debugMode.0.label=Off
 form.admin_services.debugMode.1.label=Log
+form.admin_services.logLevel.label=Log level
+form.admin_services.logLevel.help=Select the level of severity of the messages to log.
+form.admin_services.logLevel.emergency.label=Emergency: indicates that the system is unusable and requires immediate attention.
+form.admin_services.logLevel.alert.label=Alert: indicates that immediate action is necessary to resolve a critical issue.
+form.admin_services.logLevel.critical.label=Critical: signifies critical conditions in the program that demand intervention to prevent system failure.
+form.admin_services.logLevel.error.label=Error: indicates error conditions that impair some operation but are less severe than critical situations.
+form.admin_services.logLevel.warning.label=Warning: signifies potential issues that may lead to errors or unexpected behavior in the future if not addressed.
+form.admin_services.logLevel.notice.label=Notice: applies to normal but significant conditions that may require monitoring.
+form.admin_services.logLevel.info.label=Info: includes messages that provide a record of the normal operation of the system.
+form.admin_services.logLevel.debug.label=Debug: intended for logging detailed information about the system for debugging purposes.
 form.admin_services.onlyMaps.label=Disable landing page
 form.admin_services.onlyMaps.help=If set to "On", no landing page will be available.
 form.admin_services.projectSwitcher.label=Show projects switcher
diff --git a/lizmap/modules/lizmap/classes/lizmap.class.php b/lizmap/modules/lizmap/classes/lizmap.class.php
index a71846e106..489d4fed30 100644
--- a/lizmap/modules/lizmap/classes/lizmap.class.php
+++ b/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;
diff --git a/lizmap/modules/lizmap/classes/lizmapServices.class.php b/lizmap/modules/lizmap/classes/lizmapServices.class.php
index 663d49e269..4371ab9ddc 100644
--- a/lizmap/modules/lizmap/classes/lizmapServices.class.php
+++ b/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();
         }
@@ -613,9 +626,42 @@ 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;
+        }
+
+        // Force log level to debug if debug mode is on
+        if ($this->debugMode === '1' && $this->logLevel !== Logger::LogLevels[0]) {
+            $this->logLevel = Logger::LogLevels[0];
+        }
+        // Force debugMode to 1 if log level is debug
+        if ($this->debugMode !== '1' && $this->logLevel === Logger::LogLevels[0]) {
+            $this->debugMode = '1';
+        }
+
+        return $this->logLevel;
+    }
+
     /**
      * Host URL to the Lizmap QGIS Server API, taking care of the QGIS Server context : FCGI, QJazz, etc.
      *
diff --git a/tests/units/classes/lizmapServicesTest.php b/tests/units/classes/lizmapServicesTest.php
index e1fe0de15a..b0b7c03d17 100644
--- a/tests/units/classes/lizmapServicesTest.php
+++ b/tests/units/classes/lizmapServicesTest.php
@@ -242,11 +242,23 @@ public static function getModifyLocalData()
             'adminContactEmail' => 'test.test@test.com',
             'debugMode' => 'off',
         );
+        $testModify4_1 = array(
+            'appName' => 'Lizmap',
+            'adminContactEmail' => 'test.test@test.com',
+            'logLevel' => 'debug',
+        );
+        $testModify5_1 = array(
+            'appName' => 'Lizmap',
+            'adminContactEmail' => 'test.test@test.com',
+            'logLevel' => '1',
+        );
 
         return array(
             array($testModify1, $testModify1_1, null, null, true),
             array($testModify1, $testModify2_1, 'adminContactEmail', 'test.test@3liz.org', 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', 'test.test@test.com', true),
             array(null, $testModify1_1, 'adminContactEmail', 'test.test@test.com', true),
@@ -334,6 +346,7 @@ public function testSaveIntoIni($dataModification, $expectedIniValues, $expected
             'requestProxyNotForDomain',
             'cacheRedisHost',
             'cacheRedisPort',
+            'logLevel',
         );
 
         $testLizmapServices = new LizmapServices(