refactor: make log_level parameter definition optional

PrestaShopCorp · Oct 23, 2024 · 8a0199e · 8a0199e
1 parent 3bc5e5e
commit 8a0199e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/accounts-qc-php.yml b/.github/workflows/accounts-qc-php.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Scoped dependencies
         run: make php-scoper
 
-      - name: Platform build
+      - name: Start container & install module
         run: |
           make platform-${{ matrix.presta-versions }}
 

diff --git a/config/common.yml b/config/common.yml
@@ -18,8 +18,8 @@ services:
     class: PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
     public: true
     factory: [ 'PrestaShop\Module\PsAccounts\Log\Logger', 'create' ]
-    arguments:
-      - '%ps_accounts.log_level%'
+#    arguments:
+#      - '%ps_accounts.log_level%'
 
   PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider:
     class: PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider

diff --git a/src/Log/Logger.php b/src/Log/Logger.php
@@ -22,6 +22,7 @@
 
 use PrestaShop\Module\PsAccounts\Vendor\Monolog\Handler\RotatingFileHandler;
 use PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger as MonoLogger;
+use PrestaShop\Module\PsAccounts\Vendor\Psr\Log\InvalidArgumentException;
 use Ps_accounts;
 
 class Logger
@@ -43,9 +44,10 @@ class Logger
      */
     public static function create($logLevel = null)
     {
+        $logLevel = self::getLevel($logLevel);
         $monologLevel = MonoLogger::toMonologLevel($logLevel);
         if (!is_int($monologLevel)) {
-            $monologLevel = Logger::DEBUG;
+            $monologLevel = MonoLogger::DEBUG;
         }
 
         $path = _PS_ROOT_DIR_ . '/var/logs/ps_accounts';
@@ -73,4 +75,21 @@ public static function getInstance()
 
         return $psAccounts->getLogger();
     }
+
+    /**
+     * @param $logLevel
+     * @return mixed
+     */
+    public static function getLevel($logLevel)
+    {
+        if ($logLevel === null) {
+            try {
+                /** @var Ps_accounts $psAccounts */
+                $psAccounts = \Module::getInstanceByName('ps_accounts');
+                $logLevel = $psAccounts->getParameter('ps_accounts.log_level');
+            } catch (InvalidArgumentException $e) {
+            }
+        }
+        return $logLevel;
+    }
 }