badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

54
index.php
View file

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