Moved constants to LoggerProxy. Fixed issues with code convention. Added logAllQueries, logQueryTime and logCallStack parameters so they can be configured using the command.

Author: federivo

app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php

@@ -7,11 +7,11 @@
 namespace Magento\Developer\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\DB\Logger\LoggerProxy;
 
 class QueryLogDisableCommand extends Command
 {
@@ -21,22 +21,21 @@ class QueryLogDisableCommand extends Command
     const COMMAND_NAME = 'dev:query-log:disable';
 
     /**
-     * File logger alias
+     * @var Writer
      */
-    const QUIET_LOGGER_ALIAS = 'quiet';
+    private $deployConfigWriter;
 
     /**
-     * @var Writer
+     * QueryLogDisableCommand constructor.
+     * @param Writer $deployConfigWriter
+     * @param null $name
      */
-    private $deploymentConfigWriter;
-
     public function __construct(
-        Writer $deploymentConfigWriter,
+        Writer $deployConfigWriter,
         $name = null
-    )
-    {
+    ) {
         parent::__construct($name);
-        $this->deploymentConfigWriter = $deploymentConfigWriter;
+        $this->deployConfigWriter = $deployConfigWriter;
     }
 
     /**
@@ -56,9 +55,9 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $data = ['db_logger_alias' => 'quiet'];
-        $this->deploymentConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $data]);
+        $data = [LoggerProxy::PARAM_ALIAS => LoggerProxy::LOGGER_ALIAS_DISABLED];
+        $this->deployConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $data]);
 
         $output->writeln("<info>DB query logging disabled.</info>");
     }
-}
+}

app/code/Magento/Developer/Console/Command/QueryLogEnableCommand.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Developer\Console\Command;
 
+use Magento\Framework\DB\Logger\LoggerProxy;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,25 +37,23 @@ class QueryLogEnableCommand extends Command
     const COMMAND_NAME = 'dev:query-log:enable';
 
     /**
-     * File logger alias
+     * @var Writer
      */
-    const FILE_LOGGER_ALIAS = 'file';
+    private $deployConfigWriter;
 
     /**
-     * @var Writer
+     * QueryLogEnableCommand constructor.
+     * @param Writer $deployConfigWriter
+     * @param null $name
      */
-    private $deploymentConfigWriter;
-
     public function __construct(
-        Writer $deploymentConfigWriter,
+        Writer $deployConfigWriter,
         $name = null
-    )
-    {
+    ) {
         parent::__construct($name);
-        $this->deploymentConfigWriter = $deploymentConfigWriter;
+        $this->deployConfigWriter = $deployConfigWriter;
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -66,22 +65,22 @@ protected function configure()
         $this->addArgument(
             self::INPUT_ARG_LOG_ALL_QUERIES,
             InputArgument::OPTIONAL,
-            'Log all queries.',
-            'false'
+            'Log all queries. Options: "true" or "false"',
+            'true'
         );
 
         $this->addArgument(
             self::INPUT_ARG_LOG_QUERY_TIME,
             InputArgument::OPTIONAL,
-            'Query time.',
-            '0.05'
+            'Log query time.',
+            '0.001'
         );
 
         $this->addArgument(
             self::INPUT_ARG_LOG_CALL_STACK,
             InputArgument::OPTIONAL,
-            'Log call stack.',
-            'false'
+            'Log call stack. Options: "true" or "false"',
+            'true'
         );
 
         parent::configure();
@@ -93,19 +92,18 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $data = ['db_logger_alias' => 'file'];
-        $this->deploymentConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $data]);
-
-//        $data = [
-//            'db_logger' => [
-//                'logger_alias' => 'file',
-//                'log_all_queries' => false,
-//                'log_query_time' => '0.05',
-//                'log_call_stack' => false,
-//            ]
-//        ];
-//        $this->deploymentConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $data]);
+        $data = [LoggerProxy::PARAM_ALIAS => LoggerProxy::LOGGER_ALIAS_FILE];
+
+        $logAllQueries = $input->getArgument(self::INPUT_ARG_LOG_ALL_QUERIES);
+        $logQueryTime = $input->getArgument(self::INPUT_ARG_LOG_QUERY_TIME);
+        $logCallStack = $input->getArgument(self::INPUT_ARG_LOG_CALL_STACK);
+
+        $data[LoggerProxy::PARAM_LOG_ALL] = (int)($logAllQueries != 'false');
+        $data[LoggerProxy::PARAM_QUERY_TIME] = number_format($logQueryTime,3);
+        $data[LoggerProxy::PARAM_CALL_STACK] = (int)($logCallStack != 'false');
+
+        $this->deployConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $data]);
 
         $output->writeln("<info>DB query logging enabled.</info>");
     }
-}
+}

app/etc/di.xml

@@ -1321,6 +1321,10 @@
     <type name="Magento\Framework\DB\Logger\LoggerProxy">
         <arguments>
             <argument name="loggerAlias" xsi:type="init_parameter">\Magento\Framework\DB\Logger\LoggerProxy::PARAM_ALIAS</argument>
+            <argument name="logAllQueries" xsi:type="init_parameter">\Magento\Framework\DB\Logger\LoggerProxy::PARAM_LOG_ALL</argument>
+            <argument name="logQueryTime" xsi:type="init_parameter">\Magento\Framework\DB\Logger\LoggerProxy::PARAM_QUERY_TIME</argument>
+            <argument name="logCallStack" xsi:type="init_parameter">\Magento\Framework\DB\Logger\LoggerProxy::PARAM_CALL_STACK</argument>
         </arguments>
     </type>
+
 </config>

lib/internal/Magento/Framework/DB/Logger/LoggerProxy.php

@@ -3,20 +3,39 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\DB\Logger;
 
 class LoggerProxy extends LoggerAbstract
 {
     /**
      * Logger alias param name
      */
-    const PARAM_ALIAS = 'db_logger_alias';
+    const PARAM_ALIAS = 'db_logger_mode';
+
+    /**
+     * Logger log all param name
+     */
+    const PARAM_LOG_ALL = 'db_logger_all';
+
+    /**
+     * Logger query time param name
+     */
+    const PARAM_QUERY_TIME = 'db_logger_query_time';
+
+    /**
+     * Logger call stack param name
+     */
+    const PARAM_CALL_STACK = 'db_logger_stack';
 
     /**
      * File logger alias
      */
-    const FILE_LOGGER_ALIAS = 'file';
+    const LOGGER_ALIAS_FILE = 'file';
+
+    /**
+     * Quiet logger alias
+     */
+    const LOGGER_ALIAS_DISABLED = 'disabled';
 
     /**
      * @var LoggerAbstract
@@ -25,28 +44,27 @@ class LoggerProxy extends LoggerAbstract
 
     /**
      * LoggerProxy constructor.
-     * @param FileFactory $loggerFileFactory
-     * @param QuietFactory $loggerQuietFactory
+     * @param File $file
+     * @param Quiet $quiet
      * @param bool $loggerAlias
      * @param bool $logAllQueries
      * @param float $logQueryTime
      * @param bool $logCallStack
      */
     public function __construct(
-        FileFactory $loggerFileFactory,
-        QuietFactory $loggerQuietFactory,
+        File $file,
+        Quiet $quiet,
         $loggerAlias,
-        $logAllQueries = false,
-        $logQueryTime = 0.05,
-        $logCallStack = false
-    )
-    {
+        $logAllQueries = true,
+        float $logQueryTime = 0.001,
+        $logCallStack = true
+    ) {
         switch ($loggerAlias) {
-            case self::FILE_LOGGER_ALIAS:
-                $this->logger = $loggerFileFactory->create();
+            case self::LOGGER_ALIAS_FILE:
+                $this->logger = $file;
                 break;
             default:
-                $this->logger = $loggerQuietFactory->create();
+                $this->logger = $quiet;
                 break;
         }
 
@@ -84,4 +102,4 @@ public function critical(\Exception $e)
     {
         $this->logger->critical($e);
     }
-}
+}