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

w

Browse Source
This commit is contained in:
Qiang Xue
2011-09-02 00:17:45 -04:00
parent 4f134c97a2
commit b09b2da7d5
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/YiiBase.php
View File

@ -397,9 +397,9 @@ class YiiBase
* @param string $message the message to be logged. * @param string $message the message to be logged.
* @param string $category the category of the message. * @param string $category the category of the message.
*/ */
public function warn($message, $category = 'application') public function warning($message, $category = 'application')
{ {
self::getLogger()->warn($message, $category); self::getLogger()->warning($message, $category);
} }
/** /**

35
framework/db/dao/Command.php
View File

@ -32,7 +32,7 @@ namespace yii\db\dao;
* Starting from version 1.1.6, Command can also be used as a query builder * Starting from version 1.1.6, Command can also be used as a query builder
* that builds a SQL statement from code fragments. For example, * that builds a SQL statement from code fragments. For example,
* <pre> * <pre>
* $user = Yii::app()->db->createCommand() * $user = \Yii::app()->db->createCommand()
* ->select('username, password') * ->select('username, password')
* ->from('tbl_user') * ->from('tbl_user')
* ->where('id=:id', array(':id'=>1)) * ->where('id=:id', array(':id'=>1))
@ -46,7 +46,6 @@ class Command extends \yii\base\Component
{ {
/** /**
* @var array the parameters (name=>value) to be bound to the current query. * @var array the parameters (name=>value) to be bound to the current query.
* @since 1.1.6
*/ */
public $params = array(); public $params = array();
@ -163,8 +162,8 @@ class Command extends \yii\base\Component
$this->pdoStatement = $this->connection->pdo->prepare($this->getSql()); $this->pdoStatement = $this->connection->pdo->prepare($this->getSql());
$this->_paramLog = array(); $this->_paramLog = array();
} }
catch(Exception $e) { catch(\Exception $e) {
Yii::log('Error in preparing SQL: ' . $this->getSql(), CLogger::LEVEL_ERROR, 'system.db.Command'); \Yii::log('Error in preparing SQL: ' . $this->getSql(), CLogger::LEVEL_ERROR, 'system.db.Command');
$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
throw new Exception('Unable to prepare the SQL statement: {error}', throw new Exception('Unable to prepare the SQL statement: {error}',
array('{error}' => $e->getMessage())), (int)$e->getCode(), $errorInfo); array('{error}' => $e->getMessage())), (int)$e->getCode(), $errorInfo);
@ -275,11 +274,11 @@ class Command extends \yii\base\Component
} }
else else
$par = ''; $par = '';
Yii::trace('Executing SQL: ' . $this->getSql() . $par, 'system.db.Command'); \Yii::trace('Executing SQL: ' . $this->getSql() . $par, 'system.db.Command');
try try
{ {
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::beginProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute'); \Yii::beginProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute');
$this->prepare(); $this->prepare();
if ($params === array()) if ($params === array())
@ -289,21 +288,21 @@ class Command extends \yii\base\Component
$n = $this->pdoStatement->rowCount(); $n = $this->pdoStatement->rowCount();
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::endProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute'); \Yii::endProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute');
return $n; return $n;
} }
catch(Exception $e) catch(Exception $e)
{ {
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::endProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute'); \Yii::endProfile('system.db.Command.execute(' . $this->getSql() . ')', 'system.db.Command.execute');
$errorInfo = $e instanceof PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof PDOException ? $e->errorInfo : null;
$message = $e->getMessage(); $message = $e->getMessage();
Yii::log(Yii::t('yii', 'Command::execute() failed: {error}. The SQL statement executed was: {sql}.', \Yii::log(\Yii::t('yii', 'Command::execute() failed: {error}. The SQL statement executed was: {sql}.',
array('{error}' => $message, '{sql}' => $this->getSql() . $par)), CLogger::LEVEL_ERROR, 'system.db.Command'); array('{error}' => $message, '{sql}' => $this->getSql() . $par)), CLogger::LEVEL_ERROR, 'system.db.Command');
if (YII_DEBUG) if (YII_DEBUG)
$message .= '. The SQL statement executed was: ' . $this->getSql() . $par; $message .= '. The SQL statement executed was: ' . $this->getSql() . $par;
throw new CDbException(Yii::t('yii', 'Command failed to execute the SQL statement: {error}', throw new CDbException(\Yii::t('yii', 'Command failed to execute the SQL statement: {error}',
array('{error}' => $message)), (int)$e->getCode(), $errorInfo); array('{error}' => $message)), (int)$e->getCode(), $errorInfo);
} }
} }
@ -430,19 +429,19 @@ class Command extends \yii\base\Component
else else
$par = ''; $par = '';
Yii::trace('Querying SQL: ' . $this->getSql() . $par, 'system.db.Command'); \Yii::trace('Querying SQL: ' . $this->getSql() . $par, 'system.db.Command');
if ($this->connection->queryCachingCount > 0 && $method !== '' if ($this->connection->queryCachingCount > 0 && $method !== ''
&& $this->connection->queryCachingDuration > 0 && $this->connection->queryCachingDuration > 0
&& $this->connection->queryCacheID !== false && $this->connection->queryCacheID !== false
&& ($cache = Yii::app()->getComponent($this->connection->queryCacheID)) !== null) && ($cache = \Yii::app()->getComponent($this->connection->queryCacheID)) !== null)
{ {
$this->connection->queryCachingCount--; $this->connection->queryCachingCount--;
$cacheKey = 'yii:dbquery' . $this->connection->connectionString . ':' . $this->connection->username; $cacheKey = 'yii:dbquery' . $this->connection->connectionString . ':' . $this->connection->username;
$cacheKey .= ':' . $this->getSql() . ':' . serialize(array_merge($this->_paramLog, $params)); $cacheKey .= ':' . $this->getSql() . ':' . serialize(array_merge($this->_paramLog, $params));
if (($result = $cache->get($cacheKey)) !== false) if (($result = $cache->get($cacheKey)) !== false)
{ {
Yii::trace('Query result found in cache', 'system.db.Command'); \Yii::trace('Query result found in cache', 'system.db.Command');
return $result; return $result;
} }
} }
@ -450,7 +449,7 @@ class Command extends \yii\base\Component
try try
{ {
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::beginProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query'); \Yii::beginProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query');
$this->prepare(); $this->prepare();
if ($params === array()) if ($params === array())
@ -470,7 +469,7 @@ class Command extends \yii\base\Component
} }
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::endProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query'); \Yii::endProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query');
if (isset($cache, $cacheKey)) if (isset($cache, $cacheKey))
$cache->set($cacheKey, $result, $this->connection->queryCachingDuration, $this->connection->queryCachingDependency); $cache->set($cacheKey, $result, $this->connection->queryCachingDuration, $this->connection->queryCachingDependency);
@ -480,14 +479,14 @@ class Command extends \yii\base\Component
catch(Exception $e) catch(Exception $e)
{ {
if ($this->connection->enableProfiling) if ($this->connection->enableProfiling)
Yii::endProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query'); \Yii::endProfile('system.db.Command.query(' . $this->getSql() . $par . ')', 'system.db.Command.query');
$errorInfo = $e instanceof PDOException ? $e->errorInfo : null; $errorInfo = $e instanceof PDOException ? $e->errorInfo : null;
$message = $e->getMessage(); $message = $e->getMessage();
Yii::log(Yii::t('yii', 'Command::{method}() failed: {error}. The SQL statement executed was: {sql}.', \Yii::log(\Yii::t('yii', 'Command::{method}() failed: {error}. The SQL statement executed was: {sql}.',
array('{method}' => $method, '{error}' => $message, '{sql}' => $this->getSql() . $par)), CLogger::LEVEL_ERROR, 'system.db.Command'); array('{method}' => $method, '{error}' => $message, '{sql}' => $this->getSql() . $par)), CLogger::LEVEL_ERROR, 'system.db.Command');
if (YII_DEBUG) if (YII_DEBUG)
$message .= '. The SQL statement executed was: ' . $this->getSql() . $par; $message .= '. The SQL statement executed was: ' . $this->getSql() . $par;
throw new CDbException(Yii::t('yii', 'Command failed to execute the SQL statement: {error}', throw new CDbException(\Yii::t('yii', 'Command failed to execute the SQL statement: {error}',
array('{error}' => $message)), (int)$e->getCode(), $errorInfo); array('{error}' => $message)), (int)$e->getCode(), $errorInfo);
} }
} }

6
framework/logging/Logger.php
View File

@ -23,7 +23,7 @@ namespace yii\logging;
class Logger extends \yii\base\Component class Logger extends \yii\base\Component
{ {
const LEVEL_TRACE = 'trace'; const LEVEL_TRACE = 'trace';
const LEVEL_WARN = 'warn'; const LEVEL_WARNING = 'warning';
const LEVEL_ERROR = 'error'; const LEVEL_ERROR = 'error';
const LEVEL_INFO = 'info'; const LEVEL_INFO = 'info';
const LEVEL_PROFILE = 'profile'; const LEVEL_PROFILE = 'profile';
@ -90,7 +90,7 @@ class Logger extends \yii\base\Component
* @param string $message the message to be logged. * @param string $message the message to be logged.
* @param string $category the category of the message. * @param string $category the category of the message.
*/ */
public function warn($message, $category = 'application') public function warning($message, $category = 'application')
{ {
$this->log($message, self::LEVEL_TRACE, $category); $this->log($message, self::LEVEL_TRACE, $category);
} }
@ -136,7 +136,7 @@ class Logger extends \yii\base\Component
* call stack information about application code will be appended to the message. * call stack information about application code will be appended to the message.
* @param string $message the message to be logged. * @param string $message the message to be logged.
* @param string $level the level of the message. This must be one of the following: * @param string $level the level of the message. This must be one of the following:
* 'trace', 'info', 'warn', 'error', 'profile'. * 'trace', 'info', 'warning', 'error', 'profile'.
* @param string $category the category of the message. * @param string $category the category of the message.
*/ */
public function log($message, $level, $category) public function log($message, $level, $category)