diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-10-15 13:53:19 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-10-20 13:38:38 +0200 |
| commit | 9fd234f63f2e576c996bed69f2e9972aeff945e8 (patch) | |
| tree | 8585bade192bf6632c0efb7c4a47598c48683f0c | |
| parent | beb1c6ad74015a8065d0ee00c6dba24cdc699477 (diff) | |
| download | nextcloud-server-9fd234f63f2e576c996bed69f2e9972aeff945e8.tar.gz nextcloud-server-9fd234f63f2e576c996bed69f2e9972aeff945e8.zip | |
Log some additional events
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/route/router.php | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 1201e46d542..ef654e916ea 100644 --- a/lib/base.php +++ b/lib/base.php @@ -444,6 +444,7 @@ class OC { public static function init() { // register autoloader + $loaderStart = microtime(true); require_once __DIR__ . '/autoloader.php'; self::$loader = new \OC\Autoloader(); self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib'); @@ -453,10 +454,12 @@ class OC { self::$loader->registerPrefix('Patchwork', '3rdparty'); self::$loader->registerPrefix('Pimple', '3rdparty/Pimple'); spl_autoload_register(array(self::$loader, 'load')); + $loaderEnd = microtime(true); // setup the basic server self::$server = new \OC\Server(); self::initPaths(); + \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd); \OC::$server->getEventLogger()->start('boot', 'Initialize'); // set some stuff diff --git a/lib/private/route/router.php b/lib/private/route/router.php index fd6d9939184..645d6141964 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -106,6 +106,7 @@ class Router implements IRouter { * @return void */ public function loadRoutes($app = null) { + $requestedApp = $app; if ($this->loaded) { return; } @@ -123,6 +124,7 @@ class Router implements IRouter { $routingFiles = array(); } } + \OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes'); foreach ($routingFiles as $app => $file) { if (!isset($this->loadedApps[$app])) { $this->loadedApps[$app] = true; @@ -145,6 +147,7 @@ class Router implements IRouter { $collection->addPrefix('/ocs'); $this->root->addCollection($collection); } + \OC::$server->getEventLogger()->end('loadroutes' . $requestedApp); } /** @@ -202,7 +205,6 @@ class Router implements IRouter { * @return void */ public function match($url) { - \OC::$server->getEventLogger()->start('load_routes', 'Load routes'); if (substr($url, 0, 6) === '/apps/') { // empty string / 'apps' / $app / rest of the route list(, , $app,) = explode('/', $url, 4); @@ -217,7 +219,6 @@ class Router implements IRouter { } else { $this->loadRoutes(); } - \OC::$server->getEventLogger()->end('load_routes'); $matcher = new UrlMatcher($this->root, $this->context); try { |