open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Log some additional events

Browse Source
remotes/origin/fix-10825
Robin Appelman 11 years ago
parent beb1c6ad74
commit 9fd234f63f
2 changed files with 6 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      lib/base.php
  2. 5
      lib/private/route/router.php

3
lib/base.php
Unescape View File

@ -444,6 +444,7 @@ class OC {
public static function init() { public static function init() {
// register autoloader // register autoloader
$loaderStart = microtime(true);
require_once __DIR__ . '/autoloader.php'; require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader(); self::$loader = new \OC\Autoloader();
self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
@ -453,10 +454,12 @@ class OC {
self::$loader->registerPrefix('Patchwork', '3rdparty'); self::$loader->registerPrefix('Patchwork', '3rdparty');
self::$loader->registerPrefix('Pimple', '3rdparty/Pimple'); self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
spl_autoload_register(array(self::$loader, 'load')); spl_autoload_register(array(self::$loader, 'load'));
$loaderEnd = microtime(true);
// setup the basic server // setup the basic server
self::$server = new \OC\Server(); self::$server = new \OC\Server();
self::initPaths(); self::initPaths();
\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
\OC::$server->getEventLogger()->start('boot', 'Initialize'); \OC::$server->getEventLogger()->start('boot', 'Initialize');
// set some stuff // set some stuff

5
lib/private/route/router.php
Unescape View File

@ -106,6 +106,7 @@ class Router implements IRouter {
* @return void * @return void
*/ */
public function loadRoutes($app = null) { public function loadRoutes($app = null) {
$requestedApp = $app;
if ($this->loaded) { if ($this->loaded) {
return; return;
} }
@ -123,6 +124,7 @@ class Router implements IRouter {
$routingFiles = array(); $routingFiles = array();
} }
} }
\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
foreach ($routingFiles as $app => $file) { foreach ($routingFiles as $app => $file) {
if (!isset($this->loadedApps[$app])) { if (!isset($this->loadedApps[$app])) {
$this->loadedApps[$app] = true; $this->loadedApps[$app] = true;
@ -145,6 +147,7 @@ class Router implements IRouter {
$collection->addPrefix('/ocs'); $collection->addPrefix('/ocs');
$this->root->addCollection($collection); $this->root->addCollection($collection);
} }
\OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
} }
/** /**
@ -202,7 +205,6 @@ class Router implements IRouter {
* @return void * @return void
*/ */
public function match($url) { public function match($url) {
\OC::$server->getEventLogger()->start('load_routes', 'Load routes');
if (substr($url, 0, 6) === '/apps/') { if (substr($url, 0, 6) === '/apps/') {
// empty string / 'apps' / $app / rest of the route // empty string / 'apps' / $app / rest of the route
list(, , $app,) = explode('/', $url, 4); list(, , $app,) = explode('/', $url, 4);
@ -217,7 +219,6 @@ class Router implements IRouter {
} else { } else {
$this->loadRoutes(); $this->loadRoutes();
} }
\OC::$server->getEventLogger()->end('load_routes');
$matcher = new UrlMatcher($this->root, $this->context); $matcher = new UrlMatcher($this->root, $this->context);
try { try {

Write Preview
Loading…
Cancel
Save