summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2022-05-17 11:55:00 +0000
committerGitHub <noreply@github.com>2022-05-17 11:55:00 +0000
commit83f831c26382c648d759384b8c14cac2edc67fa4 (patch)
treea574957a4054e9a8aba18cf81aa2baca741d4f90 /lib/base.php
parent0b184f613586eb32cd5f30d255cd4f730aa33bbe (diff)
parenta67bf03ac09feb52a787faec2287d7e27cb929fc (diff)
downloadnextcloud-server-83f831c26382c648d759384b8c14cac2edc67fa4.tar.gz
nextcloud-server-83f831c26382c648d759384b8c14cac2edc67fa4.zip
Merge pull request #32427 from nextcloud/boot-event-ordering
reorder startup events to fix overlapping
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php
index 212bd01477c..f6a3331a798 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -595,12 +595,7 @@ class OC {
$eventLogger = \OC::$server->getEventLogger();
$eventLogger->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
- $eventLogger->start('request', 'Full request after autoloading');
- register_shutdown_function(function () use ($eventLogger) {
- $eventLogger->end('request');
- });
$eventLogger->start('boot', 'Initialize');
- $eventLogger->start('runtime', 'Runtime (total - autoloader)');
// Override php.ini and log everything if we're troubleshooting
if (self::$config->getValue('loglevel') === ILogger::DEBUG) {
@@ -804,6 +799,11 @@ class OC {
}
$eventLogger->end('boot');
$eventLogger->log('init', 'OC::init', $loaderStart, microtime(true));
+ $eventLogger->start('runtime', 'Runtime');
+ $eventLogger->start('request', 'Full request after boot');
+ register_shutdown_function(function () use ($eventLogger) {
+ $eventLogger->end('request');
+ });
}
/**