james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

InitExt / DatabaseUpgrade as part of the try/catch

Browse Source
This commit is contained in:
Shish 2020-03-18 20:26:52 +00:00
parent df3660fbcf
commit 3206110cf4
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
index.php
View File

@ -118,22 +118,22 @@ $_tracer->end();
* Send events, display output * * Send events, display output *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
//$_tracer->mark(@$_SERVER["REQUEST_URI"]); try {
$_tracer->begin( // $_tracer->mark(@$_SERVER["REQUEST_URI"]);
$_tracer->begin(
$_SERVER["REQUEST_URI"] ?? "No Request", $_SERVER["REQUEST_URI"] ?? "No Request",
[ [
"user"=>$_COOKIE["shm_user"] ?? "No User", "user"=>$_COOKIE["shm_user"] ?? "No User",
"ip"=>$_SERVER['REMOTE_ADDR'] ?? "No IP", "ip"=>$_SERVER['REMOTE_ADDR'] ?? "No IP",
"user_agent"=>$_SERVER['HTTP_USER_AGENT'] ?? "No UA", "user_agent"=>$_SERVER['HTTP_USER_AGENT'] ?? "No UA",
] ]
); );
if (!SPEED_HAX) { if (!SPEED_HAX) {
send_event(new DatabaseUpgradeEvent()); send_event(new DatabaseUpgradeEvent());
} }
send_event(new InitExtEvent()); send_event(new InitExtEvent());
try {
// start the page generation waterfall // start the page generation waterfall
$user = _get_user(); $user = _get_user();
send_event(new UserLoginEvent($user)); send_event(new UserLoginEvent($user));
@ -157,10 +157,9 @@ try {
$database->rollback(); $database->rollback();
} }
_fatal_error($e); _fatal_error($e);
} } finally {
$_tracer->end();
$_tracer->end(); if (TRACE_FILE) {
if (TRACE_FILE) {
if ( if (
empty($_SERVER["REQUEST_URI"]) empty($_SERVER["REQUEST_URI"])
|| ( || (
@ -170,4 +169,5 @@ if (TRACE_FILE) {
) { ) {
$_tracer->flush(TRACE_FILE); $_tracer->flush(TRACE_FILE);
} }
}
} }