Skip to content

Commit 8320f01

Browse files
committed
copy error message to front of log in error handler
1 parent a7d4d26 commit 8320f01

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

resources/lib/UnityHTTPD.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,19 @@ public static function shutdown()
135135
if (is_null($e) || $e["type"] !== E_ERROR) {
136136
return;
137137
}
138-
// newlines are bad for error log
139-
if (!is_null($e) && array_key_exists("message", $e) && str_contains($e["message"], "\n")) {
140-
$e["message"] = explode("\n", $e["message"]);
138+
if (!is_null($e) && array_key_exists("message", $e)) {
139+
// newlines are bad for error log
140+
if (str_contains($e["message"], "\n")) {
141+
$e["message"] = explode("\n", $e["message"]);
142+
$message = $e["message"][0] + "... (uncaught error)";
143+
} else {
144+
$message = $e["message"] + " (uncaught error)";
145+
}
146+
} else {
147+
$message = "uncaught error";
141148
}
142149
// error_get_last is an array, not a Throwable
143-
self::internalServerError("An internal server error has occurred.", data: ["error" => $e]);
150+
self::internalServerError($message, data: ["error" => $e]);
144151
}
145152

146153
public static function getPostData(...$keys)

0 commit comments

Comments
 (0)