Debugger: improved way how Tracy informs whether error was logged

nette · Dec 30, 2014 · 0ee5643 · 0ee5643
1 parent 658f509
commit 0ee5643
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Tracy/Debugger.php b/src/Tracy/Debugger.php
@@ -405,18 +405,18 @@ public static function _exceptionHandler(\Exception $exception, $exit = TRUE)
 			}
 		}
 
-		$logMsg = 'Unable to log error. Check if directory is writable and path is absolute.';
 		if (self::$productionMode) {
 			try {
 				self::log($exception, self::EXCEPTION);
 			} catch (\Exception $e) {
 			}
 
-			$error = isset($e) ? $logMsg : NULL;
 			if (self::isHtmlMode()) {
+				$logged = empty($e);
 				require __DIR__ . '/templates/error.phtml';
 			} elseif (PHP_SAPI === 'cli') {
-				fwrite(STDERR, "ERROR: application encountered an error and can not continue.\n$error\n");
+				fwrite(STDERR, 'ERROR: application encountered an error and can not continue. '
+					. (isset($e) ? "Unable to log error.\n" : "Error was logged.\n"));
 			}
 
 		} elseif (!connection_aborted() && self::isHtmlMode()) {
@@ -434,7 +434,7 @@ public static function _exceptionHandler(\Exception $exception, $exit = TRUE)
 					exec(self::$browser . ' ' . escapeshellarg($file));
 				}
 			} catch (\Exception $e) {
-				echo "$exception\n$logMsg {$e->getMessage()}\n";
+				echo "$exception\nUnable to log error: {$e->getMessage()}\n";
 			}
 		}
 

diff --git a/src/Tracy/templates/error.phtml b/src/Tracy/templates/error.phtml
@@ -2,7 +2,7 @@
 
 /**
  * Default error page.
- * @param  string $error
+ * @param  bool $logged
  */
 
 namespace Tracy;
@@ -27,5 +27,5 @@ namespace Tracy;
 	<p>We're sorry! The server encountered an internal error and
 	was unable to complete your request. Please try again later.</p>
 
-	<p><small>error 500<?php if (!empty($error)) echo "<br>Tracy says: ", htmlspecialchars($error) ?></small></p>
+	<p><small>error 500<?php if (!$logged): ?><br>Tracy is unable to log error.<?php endif ?></small></p>
 </div>
diff --git a/tests/Tracy/Debugger._exceptionHandler.development.console.phpt b/tests/Tracy/Debugger._exceptionHandler.development.console.phpt
@@ -4,7 +4,7 @@
  * Test: Tracy\Debugger::_exceptionHandler() error.
  * @exitCode   254
  * @httpCode   500
- * @outputMatch exception 'Exception' in%A%Unable to log error.%A%
+ * @outputMatch exception 'Exception' in%A%Unable to log error: %A%
  */
 
 use Tracy\Debugger;

diff --git a/tests/Tracy/Debugger._exceptionHandler.production.html.phpt b/tests/Tracy/Debugger._exceptionHandler.production.html.phpt
@@ -4,7 +4,7 @@
  * Test: Tracy\Debugger::_exceptionHandler() error.
  * @exitCode   254
  * @httpCode   500
- * @outputMatch %A%<title>Server Error</title>%A%Unable to log error%A%
+ * @outputMatch %A%<title>Server Error</title>%A%Tracy is unable to log error%A%
  */
 
 use Tracy\Debugger;