diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-13 20:14:00 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-13 20:14:00 +0200 |
commit | f82b818bdb852f63fdb4a431808f37902f4272ff (patch) | |
tree | 60e23d0b4b95a5f862661f3ad4fcc8cfa21f076f /appinfo | |
parent | c9c7b457a09ed3f1899099bba60dad21ff6ad026 (diff) |
break all the things!
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/app.php | 4 | ||||
-rw-r--r-- | appinfo/application.php | 49 | ||||
-rw-r--r-- | appinfo/routes.php | 2 |
3 files changed, 29 insertions, 26 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index 1cc9994ae..ebd5f47a7 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -25,6 +25,8 @@ $config->registerHooks(); try { $config->testDependencies(); } catch(\OCA\News\Config\DependencyException $e) { - $container->getLogger()->log($e->getMessage()); + $logger = $container->getLogger(); + $params = $container->getLoggerParameters(); + $logger->warn($e->getMessage(), $params); } diff --git a/appinfo/application.php b/appinfo/application.php index fc2e00d1a..bf11936bd 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -18,15 +18,12 @@ use \OCP\AppFramework\App; use \OCA\News\Config\AppConfig; -use \OCA\News\Core\Logger; -use \OCA\News\Core\Db; - use \OCA\News\Controller\PageController; use \OCA\News\Controller\FolderController; use \OCA\News\Controller\FeedController; use \OCA\News\Controller\ItemController; use \OCA\News\Controller\ExportController; -use \OCA\News\Controller\ApiController; +use \OCA\News\Controller\UtilityApiController; use \OCA\News\Controller\FolderApiController; use \OCA\News\Controller\FeedApiController; use \OCA\News\Controller\ItemApiController; @@ -55,8 +52,6 @@ use \OCA\News\ArticleEnhancer\Enhancer; use \OCA\News\ArticleEnhancer\XPathArticleEnhancer; use \OCA\News\ArticleEnhancer\RegexArticleEnhancer; -use \OCA\News\Middleware\CORSMiddleware; - require_once __DIR__ . '/../3rdparty/htmlpurifier/library/HTMLPurifier.auto.php'; @@ -133,8 +128,8 @@ class Application extends App { ); }); - $container->registerService('ApiController', function($c) { - return new ApiController( + $container->registerService('UtilityApiController', function($c) { + return new UtilityApiController( $c->query('AppName'), $c->query('Request'), $c->query('Updater'), @@ -160,7 +155,8 @@ class Application extends App { $c->query('FeedBusinessLayer'), $c->query('ItemBusinessLayer'), $c->query('Logger'), - $c->query('UserId') + $c->query('UserId'), + $c->query('LoggerParameters') ); }); @@ -196,7 +192,8 @@ class Application extends App { $c->query('TimeFactory'), $c->query('Config'), $c->query('Enhancer'), - $c->query('HTMLPurifier') + $c->query('HTMLPurifier'), + $c->query('LoggerParameters') ); }); @@ -284,11 +281,15 @@ class Application extends App { }); $container->registerService('Logger', function($c) { - return new Logger($c->query('AppName')); + return $c->query('ServerContainer')->getLogger(); + }); + + $container->registerService('LoggerParameters', function($c) { + return array('app' => $c->query('AppName')); }); $container->registerService('Db', function() { - return new Db(); + return $c->query('ServerContainer')->getDb(); }); $container->registerService('CoreConfig', function($c) { @@ -313,7 +314,11 @@ class Application extends App { }); $container->registerService('Config', function($c) { - $config = new Config($c->query('ConfigView'), $c->query('Logger')); + $config = new Config( + $c->query('ConfigView'), + $c->query('Logger'), + $c->query('LoggerParameters') + ); $config->read('config.ini', true); return $config; }); @@ -426,17 +431,6 @@ class Application extends App { ); }); - /** - * Middleware - */ - $container->registerService('CORSMiddleware', function($c) { - return new CORSMiddleware( - $c->query('Request') - ); - }); - - $container->registerMiddleWare('CORSMiddleware'); - } public function getAppConfig() { @@ -447,5 +441,12 @@ class Application extends App { public function getLogger() { return $this->getContainer()->query('Logger'); } + + + public function getLoggerParameters() { + return $this->getContainer()->query('LoggerParameters'); + } + + } diff --git a/appinfo/routes.php b/appinfo/routes.php index 5ba7a2df7..4d91273b6 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -63,7 +63,7 @@ $application->registerRoutes($this, array('routes' => array( array('name' => 'api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'), array('name' => 'api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'), array('name' => 'api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'), - array('name' => 'api#cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')), + array('name' => 'api#preflighted_cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')), // folders array('name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'), |