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

Merge pull request #4067 from yiisoft/better-log-target-failures

Browse Source 
Fixes #3101: Improved handling of log target failures
This commit is contained in:
Alexander Makarov
2014-06-26 16:13:56 +04:00
parent 8eb53f046f 38c056c736
commit 34c7a81a33
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -74,6 +74,7 @@ Yii Framework 2 Change Log
- Enh #2942: Added truncate and truncateWord methods (Alex-Code, samdark) - Enh #2942: Added truncate and truncateWord methods (Alex-Code, samdark)
- Enh #3008: Added `Html::errorSummary()` (qiangxue) - Enh #3008: Added `Html::errorSummary()` (qiangxue)
- Enh #3088: The debug and gii modules will manage their own URL rules now (hiltonjanfield, qiangxue) - Enh #3088: The debug and gii modules will manage their own URL rules now (hiltonjanfield, qiangxue)
- Enh #3101: Improved handling of log target failures. It will now skip target and log reason instead of going into infinite cycle (samdark)
- Enh #3103: debugger panel is now not displayed when printing a page (githubjeka) - Enh #3103: debugger panel is now not displayed when printing a page (githubjeka)
- Enh #3108: Added `yii\debug\Module::enableDebugLogs` to disable logging debug logs by default (qiangxue) - Enh #3108: Added `yii\debug\Module::enableDebugLogs` to disable logging debug logs by default (qiangxue)
- Enh #3132: `yii\rbac\PhpManager` now supports more compact data file format (qiangxue) - Enh #3132: `yii\rbac\PhpManager` now supports more compact data file format (qiangxue)

18
framework/log/Dispatcher.php
View File

@@ -175,10 +175,26 @@ class Dispatcher extends Component
*/ */
public function dispatch($messages, $final) public function dispatch($messages, $final)
{ {
$targetErrors = [];
foreach ($this->targets as $target) { foreach ($this->targets as $target) {
if ($target->enabled) { if ($target->enabled) {
$target->collect($messages, $final); try {
$target->collect($messages, $final);
} catch (\Exception $e) {
$target->enabled = false;
$targetErrors[] = [
'Unable to send log via '. get_class($target) .': ' . $e->getMessage(),
Logger::LEVEL_WARNING,
__METHOD__,
microtime(true),
[],
];
}
} }
} }
if (!empty($targetErrors)) {
$this->dispatch($targetErrors, true);
}
} }
} }