php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-17 07:51:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #18120: Include path to the log file into error message if FileTarget::export fails

Browse Source
This commit is contained in:
Oleg Poludnenko
2020-06-19 11:35:14 +03:00
committed by GitHub
parent a41879a321
commit 658c822f30
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -19,6 +19,7 @@ Yii Framework 2 Change Log
- Enh #18083: Add `Controller::$request` and `$response` (brandonkelly) - Enh #18083: Add `Controller::$request` and `$response` (brandonkelly)
- Bug #18101: Fix behavior of OUTPUT INSERTED.* for SQL Server query: "insert default values"; correct MSSQL unit tests; turn off profiling echo message in migration test (darkdef) - Bug #18101: Fix behavior of OUTPUT INSERTED.* for SQL Server query: "insert default values"; correct MSSQL unit tests; turn off profiling echo message in migration test (darkdef)
- Bug #18105: Fix for old trigger in RBAC migration with/without prefixTable (darkdef) - Bug #18105: Fix for old trigger in RBAC migration with/without prefixTable (darkdef)
- Enh #18120: Include path to the log file into error message if `FileTarget::export` fails (uaoleg)
2.0.35 May 02, 2020 2.0.35 May 02, 2020

8
framework/log/FileTarget.php
View File

@ -123,21 +123,21 @@ class FileTarget extends Target
$writeResult = @file_put_contents($this->logFile, $text, FILE_APPEND | LOCK_EX); $writeResult = @file_put_contents($this->logFile, $text, FILE_APPEND | LOCK_EX);
if ($writeResult === false) { if ($writeResult === false) {
$error = error_get_last(); $error = error_get_last();
throw new LogRuntimeException("Unable to export log through file!: {$error['message']}"); throw new LogRuntimeException("Unable to export log through file ({$this->logFile})!: {$error['message']}");
} }
$textSize = strlen($text); $textSize = strlen($text);
if ($writeResult < $textSize) { if ($writeResult < $textSize) {
throw new LogRuntimeException("Unable to export whole log through file! Wrote $writeResult out of $textSize bytes."); throw new LogRuntimeException("Unable to export whole log through file ({$this->logFile})! Wrote $writeResult out of $textSize bytes.");
} }
} else { } else {
$writeResult = @fwrite($fp, $text); $writeResult = @fwrite($fp, $text);
if ($writeResult === false) { if ($writeResult === false) {
$error = error_get_last(); $error = error_get_last();
throw new LogRuntimeException("Unable to export log through file!: {$error['message']}"); throw new LogRuntimeException("Unable to export log through file ({$this->logFile})!: {$error['message']}");
} }
$textSize = strlen($text); $textSize = strlen($text);
if ($writeResult < $textSize) { if ($writeResult < $textSize) {
throw new LogRuntimeException("Unable to export whole log through file! Wrote $writeResult out of $textSize bytes."); throw new LogRuntimeException("Unable to export whole log through file ({$this->logFile})! Wrote $writeResult out of $textSize bytes.");
} }
@flock($fp, LOCK_UN); @flock($fp, LOCK_UN);
@fclose($fp); @fclose($fp);