mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow configuring the command bus

This commit is contained in:
Robin Appelman 2017-08-24 16:21:50 +02:00
parent 9731350ace
commit 5431b8bfc2
1 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lib/private/Server.php
View File

@ -39,6 +39,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
* *
*/ */
namespace OC; namespace OC;
use bantu\IniGetWrapper\IniGetWrapper; use bantu\IniGetWrapper\IniGetWrapper;
@ -139,7 +140,7 @@ class Server extends ServerContainer implements IServerContainer {
parent::__construct(); parent::__construct();
$this->webRoot = $webRoot; $this->webRoot = $webRoot;
$this->registerService(\OCP\IServerContainer::class, function(IServerContainer $c) { $this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
return $c; return $c;
}); });
@ -149,7 +150,6 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerAlias(IActionFactory::class, ActionFactory::class); $this->registerAlias(IActionFactory::class, ActionFactory::class);
$this->registerService(\OCP\IPreview::class, function (Server $c) { $this->registerService(\OCP\IPreview::class, function (Server $c) {
return new PreviewManager( return new PreviewManager(
$c->getConfig(), $c->getConfig(),
@ -256,8 +256,8 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class); $this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
$this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) { $this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
return new LazyRoot(function() use ($c) { return new LazyRoot(function () use ($c) {
return $c->query('RootFolder'); return $c->query('RootFolder');
}); });
}); });
@ -295,7 +295,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('GroupManager', \OCP\IGroupManager::class); $this->registerAlias('GroupManager', \OCP\IGroupManager::class);
$this->registerService(Store::class, function(Server $c) { $this->registerService(Store::class, function (Server $c) {
$session = $c->getSession(); $session = $c->getSession();
if (\OC::$server->getSystemConfig()->getValue('installed', false)) { if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
$tokenProvider = $c->query('OC\Authentication\Token\IProvider'); $tokenProvider = $c->query('OC\Authentication\Token\IProvider');
@ -535,7 +535,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('Search', \OCP\ISearch::class); $this->registerAlias('Search', \OCP\ISearch::class);
$this->registerService(\OC\Security\RateLimiting\Limiter::class, function($c) { $this->registerService(\OC\Security\RateLimiting\Limiter::class, function ($c) {
return new \OC\Security\RateLimiting\Limiter( return new \OC\Security\RateLimiting\Limiter(
$this->getUserSession(), $this->getUserSession(),
$this->getRequest(), $this->getRequest(),
@ -543,7 +543,7 @@ class Server extends ServerContainer implements IServerContainer {
$c->query(\OC\Security\RateLimiting\Backend\IBackend::class) $c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
); );
}); });
$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) { $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
return new \OC\Security\RateLimiting\Backend\MemoryCache( return new \OC\Security\RateLimiting\Backend\MemoryCache(
$this->getMemCacheFactory(), $this->getMemCacheFactory(),
new \OC\AppFramework\Utility\TimeFactory() new \OC\AppFramework\Utility\TimeFactory()
@ -677,7 +677,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) { $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
$loader = \OC\Files\Filesystem::getLoader(); $loader = \OC\Files\Filesystem::getLoader();
$mountCache = $c->query('UserMountCache'); $mountCache = $c->query('UserMountCache');
$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache); $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
// builtin providers // builtin providers
@ -694,13 +694,24 @@ class Server extends ServerContainer implements IServerContainer {
return new IniGetWrapper(); return new IniGetWrapper();
}); });
$this->registerService('AsyncCommandBus', function (Server $c) { $this->registerService('AsyncCommandBus', function (Server $c) {
$jobList = $c->getJobList(); $busClass = $c->getConfig()->getSystemValue('commandbus');
return new CronBus($jobList); if ($busClass) {
list($app, $class) = explode('::', $busClass, 2);
if ($c->getAppManager()->isInstalled($app)) {
\OC_App::loadApp($app);
return $c->query($class);
} else {
throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
}
} else {
$jobList = $c->getJobList();
return new CronBus($jobList);
}
}); });
$this->registerService('TrustedDomainHelper', function ($c) { $this->registerService('TrustedDomainHelper', function ($c) {
return new TrustedDomainHelper($this->getConfig()); return new TrustedDomainHelper($this->getConfig());
}); });
$this->registerService('Throttler', function(Server $c) { $this->registerService('Throttler', function (Server $c) {
return new Throttler( return new Throttler(
$c->getDatabaseConnection(), $c->getDatabaseConnection(),
new TimeFactory(), new TimeFactory(),
@ -711,7 +722,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('IntegrityCodeChecker', function (Server $c) { $this->registerService('IntegrityCodeChecker', function (Server $c) {
// IConfig and IAppManager requires a working database. This code // IConfig and IAppManager requires a working database. This code
// might however be called when ownCloud is not yet setup. // might however be called when ownCloud is not yet setup.
if(\OC::$server->getSystemConfig()->getValue('installed', false)) { if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
$config = $c->getConfig(); $config = $c->getConfig();
$appManager = $c->getAppManager(); $appManager = $c->getAppManager();
} else { } else {
@ -720,13 +731,13 @@ class Server extends ServerContainer implements IServerContainer {
} }
return new Checker( return new Checker(
new EnvironmentHelper(), new EnvironmentHelper(),
new FileAccessHelper(), new FileAccessHelper(),
new AppLocator(), new AppLocator(),
$config, $config,
$c->getMemCacheFactory(), $c->getMemCacheFactory(),
$appManager, $appManager,
$c->getTempManager() $c->getTempManager()
); );
}); });
$this->registerService(\OCP\IRequest::class, function ($c) { $this->registerService(\OCP\IRequest::class, function ($c) {
@ -776,10 +787,10 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('Mailer', \OCP\Mail\IMailer::class); $this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
$this->registerService('LDAPProvider', function(Server $c) { $this->registerService('LDAPProvider', function (Server $c) {
$config = $c->getConfig(); $config = $c->getConfig();
$factoryClass = $config->getSystemValue('ldapProviderFactory', null); $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
if(is_null($factoryClass)) { if (is_null($factoryClass)) {
throw new \Exception('ldapProviderFactory not set'); throw new \Exception('ldapProviderFactory not set');
} }
/** @var \OCP\LDAP\ILDAPProviderFactory $factory */ /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
@ -845,7 +856,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class); $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
$this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) { $this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
$config = $c->getConfig(); $config = $c->getConfig();
$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory'); $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
/** @var \OCP\Comments\ICommentsManagerFactory $factory */ /** @var \OCP\Comments\ICommentsManagerFactory $factory */
@ -854,7 +865,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class); $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
$this->registerService('ThemingDefaults', function(Server $c) { $this->registerService('ThemingDefaults', function (Server $c) {
/* /*
* Dark magic for autoloader. * Dark magic for autoloader.
* If we do a class_exists it will try to load the class which will * If we do a class_exists it will try to load the class which will
@ -880,7 +891,7 @@ class Server extends ServerContainer implements IServerContainer {
} }
return new \OC_Defaults(); return new \OC_Defaults();
}); });
$this->registerService(SCSSCacher::class, function(Server $c) { $this->registerService(SCSSCacher::class, function (Server $c) {
/** @var Factory $cacheFactory */ /** @var Factory $cacheFactory */
$cacheFactory = $c->query(Factory::class); $cacheFactory = $c->query(Factory::class);
return new SCSSCacher( return new SCSSCacher(
@ -940,14 +951,14 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class); $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) { $this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
return new ContentSecurityPolicyNonceManager( return new ContentSecurityPolicyNonceManager(
$c->getCsrfTokenManager(), $c->getCsrfTokenManager(),
$c->getRequest() $c->getRequest()
); );
}); });
$this->registerService(\OCP\Share\IManager::class, function(Server $c) { $this->registerService(\OCP\Share\IManager::class, function (Server $c) {
$config = $c->getConfig(); $config = $c->getConfig();
$factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory'); $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
/** @var \OCP\Share\IProviderFactory $factory */ /** @var \OCP\Share\IProviderFactory $factory */
@ -974,7 +985,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('ShareManager', \OCP\Share\IManager::class); $this->registerAlias('ShareManager', \OCP\Share\IManager::class);
$this->registerService('SettingsManager', function(Server $c) { $this->registerService('SettingsManager', function (Server $c) {
$manager = new \OC\Settings\Manager( $manager = new \OC\Settings\Manager(
$c->getLogger(), $c->getLogger(),
$c->getDatabaseConnection(), $c->getDatabaseConnection(),
@ -1002,7 +1013,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerService('LockdownManager', function (Server $c) { $this->registerService('LockdownManager', function (Server $c) {
return new LockdownManager(function() use ($c) { return new LockdownManager(function () use ($c) {
return $c->getSession(); return $c->getSession();
}); });
}); });
@ -1038,11 +1049,11 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerAlias('Defaults', \OCP\Defaults::class); $this->registerAlias('Defaults', \OCP\Defaults::class);
$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) { $this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
return $c->query(\OCP\IUserSession::class)->getSession(); return $c->query(\OCP\IUserSession::class)->getSession();
}); });
$this->registerService(IShareHelper::class, function(Server $c) { $this->registerService(IShareHelper::class, function (Server $c) {
return new ShareHelper( return new ShareHelper(
$c->query(\OCP\Share\IManager::class) $c->query(\OCP\Share\IManager::class)
); );