[Pkg-owncloud-commits] [owncloud] 202/457: expose locking provider in the server container

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit cdf7f91259d5e0e261832d0edffadf3760575223
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon May 4 14:02:27 2015 +0200

    expose locking provider in the server container
---
 lib/private/server.php          | 18 ++++++++++++++++++
 lib/public/iservercontainer.php |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/lib/private/server.php b/lib/private/server.php
index aeea4a6..7c8e59c 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -43,6 +43,7 @@ use OC\Command\AsyncBus;
 use OC\Diagnostics\NullQueryLogger;
 use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\QueryLogger;
+use OC\Lock\MemcacheLockingProvider;
 use OC\Mail\Mailer;
 use OC\Memcache\ArrayCache;
 use OC\Http\Client\ClientService;
@@ -420,6 +421,13 @@ class Server extends SimpleContainer implements IServerContainer {
 				$this->getLogger()
 			);
 		});
+		$this->registerService('LockingProvider', function (Server $c) {
+			/** @var \OC\Memcache\Factory $memcacheFactory */
+			$memcacheFactory = $c->getMemCacheFactory();
+			return new MemcacheLockingProvider(
+				$memcacheFactory->createDistributed('lock')
+			);
+		});
 	}
 
 	/**
@@ -908,4 +916,14 @@ class Server extends SimpleContainer implements IServerContainer {
 	public function getTrustedDomainHelper() {
 		return $this->query('TrustedDomainHelper');
 	}
+
+	/**
+	 * Get the locking provider
+	 *
+	 * @return \OCP\Lock\ILockingProvider
+	 * @since 8.1.0
+	 */
+	public function getLockingProvider() {
+		return $this->query('LockingProvider');
+	}
 }
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 5dd545a..8f0bede 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -413,4 +413,12 @@ interface IServerContainer {
 	 * @since 8.1.0
 	 */
 	public function getMailer();
+
+	/**
+	 * Get the locking provider
+	 *
+	 * @return \OCP\Lock\ILockingProvider
+	 * @since 8.1.0
+	 */
+	public function getLockingProvider();
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git