Enable/Disable DB query logging commands

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

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+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
+{
+    /**
+     * command name
+     */
+    const COMMAND_NAME = 'dev:query-log:disable';
+
+    /**
+     * @var Writer
+     */
+    private $deployConfigWriter;
+
+    /**
+     * QueryLogDisableCommand constructor.
+     * @param Writer $deployConfigWriter
+     * @param null $name
+     */
+    public function __construct(
+        Writer $deployConfigWriter,
+        $name = null
+    ) {
+        parent::__construct($name);
+        $this->deployConfigWriter = $deployConfigWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_NAME)
+            ->setDescription('Disable DB query logging');
+
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $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

@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+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;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\Config\File\ConfigFilePool;
+
+class QueryLogEnableCommand extends Command
+{
+    /**
+     * input parameter log-all-queries
+     */
+    const INPUT_ARG_LOG_ALL_QUERIES = 'log-all-queries';
+
+    /**
+     * input parameter log-query-time
+     */
+    const INPUT_ARG_LOG_QUERY_TIME = 'log-query-time';
+
+    /**
+     * input parameter log-call-stack
+     */
+    const INPUT_ARG_LOG_CALL_STACK = 'log-call-stack';
+
+    /**
+     * command name
+     */
+    const COMMAND_NAME = 'dev:query-log:enable';
+
+    /**
+     * @var Writer
+     */
+    private $deployConfigWriter;
+
+    /**
+     * QueryLogEnableCommand constructor.
+     * @param Writer $deployConfigWriter
+     * @param null $name
+     */
+    public function __construct(
+        Writer $deployConfigWriter,
+        $name = null
+    ) {
+        parent::__construct($name);
+        $this->deployConfigWriter = $deployConfigWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_NAME)
+            ->setDescription('Enable DB query logging');
+
+        $this->addArgument(
+            self::INPUT_ARG_LOG_ALL_QUERIES,
+            InputArgument::OPTIONAL,
+            'Log all queries. Options: "true" or "false"',
+            'true'
+        );
+
+        $this->addArgument(
+            self::INPUT_ARG_LOG_QUERY_TIME,
+            InputArgument::OPTIONAL,
+            'Log query time.',
+            '0.001'
+        );
+
+        $this->addArgument(
+            self::INPUT_ARG_LOG_CALL_STACK,
+            InputArgument::OPTIONAL,
+            'Log call stack. Options: "true" or "false"',
+            'true'
+        );
+
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $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/code/Magento/Developer/etc/di.xml

@@ -98,6 +98,8 @@
                 <item name="xml_converter" xsi:type="object">Magento\Developer\Console\Command\XmlConverterCommand</item>
                 <item name="xml_catalog_generator" xsi:type="object">Magento\Developer\Console\Command\XmlCatalogGenerateCommand</item>
                 <item name="dev_di_info" xsi:type="object">Magento\Developer\Console\Command\DiInfoCommand</item>
+                <item name="dev_query_log_enable" xsi:type="object">Magento\Developer\Console\Command\QueryLogEnableCommand</item>
+                <item name="dev_query_log_disable" xsi:type="object">Magento\Developer\Console\Command\QueryLogDisableCommand</item>
             </argument>
         </arguments>
     </type>

app/etc/di.xml

@@ -102,7 +102,7 @@
     <preference for="Magento\Framework\Api\MetadataObjectInterface" type="Magento\Framework\Api\AttributeMetadata"/>
     <preference for="Magento\Framework\Api\SearchCriteriaInterface" type="Magento\Framework\Api\SearchCriteria"/>
     <preference for="Magento\Framework\App\Rss\UrlBuilderInterface" type="Magento\Framework\App\Rss\UrlBuilder"/>
-    <preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Quiet"/>
+    <preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\LoggerProxy"/>
     <preference for="Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface" type="Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql"/>
     <preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
     <preference for="Magento\Framework\App\ProductMetadataInterface" type="Magento\Framework\App\ProductMetadata"/>
@@ -1318,4 +1318,13 @@
             </argument>
         </arguments>
     </type>
+    <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

@@ -0,0 +1,105 @@
+<?php
+/**
+ * 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_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 LOGGER_ALIAS_FILE = 'file';
+
+    /**
+     * Quiet logger alias
+     */
+    const LOGGER_ALIAS_DISABLED = 'disabled';
+
+    /**
+     * @var LoggerAbstract
+     */
+    private $logger;
+
+    /**
+     * LoggerProxy constructor.
+     * @param File $file
+     * @param Quiet $quiet
+     * @param bool $loggerAlias
+     * @param bool $logAllQueries
+     * @param float $logQueryTime
+     * @param bool $logCallStack
+     */
+    public function __construct(
+        File $file,
+        Quiet $quiet,
+        $loggerAlias,
+        $logAllQueries = true,
+        $logQueryTime = 0.001,
+        $logCallStack = true
+    ) {
+        switch ($loggerAlias) {
+            case self::LOGGER_ALIAS_FILE:
+                $this->logger = $file;
+                break;
+            default:
+                $this->logger = $quiet;
+                break;
+        }
+
+        parent::__construct($logAllQueries, $logQueryTime, $logCallStack);
+    }
+
+    /**
+     * Adds log record
+     *
+     * @param string $str
+     * @return void
+     */
+    public function log($str)
+    {
+        $this->logger->log($str);
+    }
+
+    /**
+     * @param string $type
+     * @param string $sql
+     * @param array $bind
+     * @param \Zend_Db_Statement_Pdo|null $result
+     * @return void
+     */
+    public function logStats($type, $sql, $bind = [], $result = null)
+    {
+        $this->logger->logStats($type, $sql, $bind, $result);
+    }
+
+    /**
+     * @param \Exception $e
+     * @return void
+     */
+    public function critical(\Exception $e)
+    {
+        $this->logger->critical($e);
+    }
+}