php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 22:32:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14877: Disabled profiling on connection opening when profiling is disabled

Browse Source
This commit is contained in:
Nelson J Morais
2017-10-19 23:28:05 +01:00
committed by Alexander Makarov
parent b5e0903435
commit 980cfde0f1
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.13 under development 2.0.13 under development
------------------------ ------------------------
- Enh #14877: Disabled profiling on connection opening when profiling is disabled (njasm)
- Enh #14967: Added Armenian Translations (gevorgmansuryan) - Enh #14967: Added Armenian Translations (gevorgmansuryan)
- Enh #4479: Implemented REST filters (klimov-paul) - Enh #4479: Implemented REST filters (klimov-paul)
- Bug #14134: Fixed multiple `validateAttribute()` calls when `scenarios()` returns duplicate attributes (krukru) - Bug #14134: Fixed multiple `validateAttribute()` calls when `scenarios()` returns duplicate attributes (krukru)

13
framework/db/Connection.php
View File

@ -382,7 +382,7 @@ class Connection extends Component
*/ */
public $enableLogging = true; public $enableLogging = true;
/** /**
* @var bool whether to enable profiling of database queries. Defaults to true. * @var bool whether to enable profiling of opening database connection and database queries. Defaults to true.
* You may want to disable this option in a production environment to gain performance * You may want to disable this option in a production environment to gain performance
* if you do not need the information being logged. * if you do not need the information being logged.
* @since 2.0.12 * @since 2.0.12
@ -574,15 +574,26 @@ class Connection extends Component
if (empty($this->dsn)) { if (empty($this->dsn)) {
throw new InvalidConfigException('Connection::dsn cannot be empty.'); throw new InvalidConfigException('Connection::dsn cannot be empty.');
} }
$token = 'Opening DB connection: ' . $this->dsn; $token = 'Opening DB connection: ' . $this->dsn;
$enableProfiling = $this->enableProfiling;
try { try {
Yii::info($token, __METHOD__); Yii::info($token, __METHOD__);
if ($enableProfiling) {
Yii::beginProfile($token, __METHOD__); Yii::beginProfile($token, __METHOD__);
}
$this->pdo = $this->createPdoInstance(); $this->pdo = $this->createPdoInstance();
$this->initConnection(); $this->initConnection();
if ($enableProfiling) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
}
} catch (\PDOException $e) { } catch (\PDOException $e) {
if ($enableProfiling) {
Yii::endProfile($token, __METHOD__); Yii::endProfile($token, __METHOD__);
}
throw new Exception($e->getMessage(), $e->errorInfo, (int) $e->getCode(), $e); throw new Exception($e->getMessage(), $e->errorInfo, (int) $e->getCode(), $e);
} }
} }